Merge remote-tracking branch 'origin/dev' into dev

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierSupplement.java

@@ -74,12 +74,12 @@ public class XzdSupplierSupplement extends BaseEntity {
     /**
      * 审核标志（0：未审核，1：已审核）
      */
-    private Long auditFlag;
+    private String auditFlag;
 
     /**
      * 冻结标志（0：未冻结，1：已冻结）
      */
-    private Long freezeFlag;
+    private String freezeFlag;
 
     /**
      * 冻结开始时间

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierSupplementBo.java

@@ -79,13 +79,13 @@ public class XzdSupplierSupplementBo extends BaseEntity {
      * 审核标志（0：未审核，1：已审核）
      */
     @NotNull(message = "审核标志（0：未审核，1：已审核）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long auditFlag;
+    private String auditFlag;
 
     /**
      * 冻结标志（0：未冻结，1：已冻结）
      */
     @NotNull(message = "冻结标志（0：未冻结，1：已冻结）不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long freezeFlag;
+    private String freezeFlag;
 
     /**
      * 冻结开始时间

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierSupplementVo.java

@@ -86,14 +86,14 @@ public class XzdSupplierSupplementVo implements Serializable {
      */
     @ExcelProperty(value = "审核标志", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=：未审核，1：已审核")
-    private Long auditFlag;
+    private String auditFlag;
 
     /**
      * 冻结标志（0：未冻结，1：已冻结）
      */
     @ExcelProperty(value = "冻结标志", converter = ExcelDictConvert.class)
     @ExcelDictFormat(readConverterExp = "0=：未冻结，1：已冻结")
-    private Long freezeFlag;
+    private String freezeFlag;
 
     /**
      * 冻结开始时间