syh 4 rokov pred
rodič
commit
c712a48a72

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 9 - 40
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java


+ 2 - 20
module-alarm/src/main/java/cn/com/ctop/alarm/modules/entity/RuleIndicator.java

@@ -29,9 +29,9 @@ public class RuleIndicator {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "id")
-    private Integer id;
+    private Long id;
     /**
      * 1:头条2:快手
      */
@@ -80,26 +80,8 @@ public class RuleIndicator {
     @Excel(name = "对应数据表名称", width = 15)
     @ApiModelProperty(value = "对应数据表名称")
     private String tableName;
-    /**
-     * status
-     */
-    @Excel(name = "status", width = 15)
-    @ApiModelProperty(value = "status")
     private Integer status;
-    /**
-     * sort
-     */
-    @Excel(name = "sort", width = 15)
-    @ApiModelProperty(value = "sort")
     private Integer sort;
-    /**
-     * createTime
-     */
-    @ApiModelProperty(value = "createTime")
     private Date createTime;
-    /**
-     * updateTime
-     */
-    @ApiModelProperty(value = "updateTime")
     private Date updateTime;
 }

+ 0 - 2
module-alarm/src/main/java/cn/com/ctop/alarm/modules/enums/StatusEnum.java

@@ -1,7 +1,5 @@
 package cn.com.ctop.alarm.modules.enums;
 
-import lombok.Data;
-
 public enum StatusEnum {
     STATUSM1("-1", "不限"),
     STATUS1("1", "已暂停"),