Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/util/ImUtil.java

@@ -845,7 +845,7 @@ public class ImUtil {
	public JSONObject getSessionUnreadMessageCount(String sessionId, String userId) {
		String url = im_host + "api/v2/sessions/" + sessionId + "/unread_message_count?user_id=" + userId;
		try {
			String ret = httpClientUtil.get(url, "utf-8");
			String ret = HttpClientUtil.get(url, "utf-8");
			return  JSONObject.parseObject(ret);
		} catch (Exception e) {
			throw new RuntimeException("获取会话成员！sessionId =" + sessionId);

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/SystemMessageDO.java

@@ -61,7 +61,6 @@ public class SystemMessageDO extends UuidIdentityEntity {
     */
    private String del;
    private String over;//是否操作结束 是否操作结束 1否，0是
    private String code;
    /**
     *已读时间
     */
@@ -232,12 +231,4 @@ public class SystemMessageDO extends UuidIdentityEntity {
    public void setOver(String over) {
        this.over = over;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/rehabilitation/SpecialDiseaseMessagesDO.java

@@ -1,6 +1,6 @@
package com.yihu.wlyy.entity.specialist;
package com.yihu.jw.entity.rehabilitation;
import com.yihu.wlyy.entity.IdEntity;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -13,7 +13,7 @@ import javax.persistence.Table;
 */
@Entity
@Table(name = "wlyy_special_disease_messages")
public class SpecialDiseaseMessages extends IdEntity {
public class SpecialDiseaseMessagesDO extends IdEntity {
    private String name;
    private String address;