1.冲突修改

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/SysMessageWrapper.java

@@ -41,6 +41,8 @@ public class SysMessageWrapper {
         @ApiModelProperty("客户端STUDENT,TEACHER,BACKEND,SCHOOL")
         private ClientEnum clientId;
 
+        private ClientEnum clientType;
+
         @ApiModelProperty(value = "状态，0,待发送;1,发送中;2,发送完成 ")
         private SendStatusEnum status;
 
@@ -65,6 +67,9 @@ public class SysMessageWrapper {
         @ApiModelProperty("发送结束时间")
         private Date endTime;
 
+        // 发送时间
+        private Date sendTime;
+
         private Long messageConfigId;
 
         public String jsonString() {