推送（未完）

module_kzks/src/main/java/org/jeecg/modules/projectPushList/entity/ProjectPushList.java

@@ -36,6 +36,30 @@ public class ProjectPushList implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
+    /**任务号*/
+    @Excel(name = "任务号", width = 15)
+    @ApiModelProperty(value = "任务号")
+    private java.lang.String taskno;
+    /**任务名称*/
+    @Excel(name = "任务名称", width = 15)
+    @ApiModelProperty(value = "任务名称")
+    private java.lang.String taskname;
+    /**推送设置ID*/
+    @Excel(name = "推送设置ID", width = 15)
+    @ApiModelProperty(value = "推送设置ID")
+    private java.lang.String pushSetId;
+    /**推送至*/
+    @Excel(name = "推送至", width = 15)
+    @ApiModelProperty(value = "推送至")
+    private java.lang.String pushTo;
+    /**推送内容*/
+    @Excel(name = "推送内容", width = 15)
+    @ApiModelProperty(value = "推送内容")
+    private java.lang.String content;
+    /**推送状态*/
+    @Excel(name = "推送状态", width = 15)
+    @ApiModelProperty(value = "推送状态")
+    private java.lang.String status;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
@@ -55,28 +79,5 @@ public class ProjectPushList implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
-	/**任务号*/
-	@Excel(name = "任务号", width = 15)
-    @ApiModelProperty(value = "任务号")
-    private java.lang.String taskno;
-	/**任务名称*/
-	@Excel(name = "任务名称", width = 15)
-    @ApiModelProperty(value = "任务名称")
-    private java.lang.String taskname;
-	/**推送设置ID*/
-	@Excel(name = "推送设置ID", width = 15)
-    @ApiModelProperty(value = "推送设置ID")
-    private java.lang.String pushSetId;
-	/**推送至*/
-	@Excel(name = "推送至", width = 15)
-    @ApiModelProperty(value = "推送至")
-    private java.lang.String pushTo;
-	/**推送内容*/
-	@Excel(name = "推送内容", width = 15)
-    @ApiModelProperty(value = "推送内容")
-    private java.lang.String content;
-	/**推送状态*/
-	@Excel(name = "推送状态", width = 15)
-    @ApiModelProperty(value = "推送状态")
-    private java.lang.String status;
+
 }

module_kzks/src/main/java/org/jeecg/modules/projectPushSet/entity/ProjectPushSet.java

@@ -36,6 +36,28 @@ public class ProjectPushSet implements Serializable {
 	@TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "id")
     private java.lang.String id;
+    /**成本类型*/
+    @Excel(name = "成本类型", width = 15)
+    @Dict(dicCode = "project_push_type")
+    @ApiModelProperty(value = "成本类型")
+    private java.lang.Integer costType;
+    /**阶段(%)*/
+    @Excel(name = "阶段(%)", width = 15)
+    @ApiModelProperty(value = "阶段(%)")
+    private java.lang.String stage;
+    /**推送内容*/
+    @Excel(name = "推送内容", width = 15)
+    @ApiModelProperty(value = "推送内容")
+    private java.lang.String content;
+    /**推送角色（多个）*/
+    @Dict(dictTable = "sys_role", dicText = "role_name", dicCode = "id")
+    @Excel(name = "推送角色", width = 15)
+    @ApiModelProperty(value = "推送角色（多个）")
+    private java.lang.String pushTo;
+    /**备注*/
+    @Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
@@ -55,26 +77,4 @@ public class ProjectPushSet implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
-	/**成本类型*/
-	@Excel(name = "成本类型", width = 15)
-    @Dict(dicCode = "project_push_type")
-    @ApiModelProperty(value = "成本类型")
-    private java.lang.String costType;
-	/**阶段(%)*/
-	@Excel(name = "阶段(%)", width = 15)
-    @ApiModelProperty(value = "阶段(%)")
-    private java.lang.String stage;
-	/**推送内容*/
-	@Excel(name = "推送内容", width = 15)
-    @ApiModelProperty(value = "推送内容")
-    private java.lang.String content;
-	/**推送角色*/
-	@Excel(name = "推送角色", width = 15)
-    @Dict(dictTable = "sys_role", dicText = "role_name", dicCode = "id")
-    @ApiModelProperty(value = "推送角色")
-    private java.lang.String pushTo;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private java.lang.String remark;
 }