Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-socket/src/com/js/kbt/model/PacketMessage.java

@@ -1,18 +0,0 @@
-package com.js.kbt.model;
-
-import org.springframework.stereotype.Service;
-
-@Service("packetMessage")
-public class PacketMessage {
-	private String message;
-
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-	
-
-}