Merge remote-tracking branch 'origin/master'

delivery-module-system/delivery-module-system-api/src/main/java/com/unis/module/system/enums/DictTypeConstants.java

@@ -24,6 +24,8 @@ public interface DictTypeConstants {
     String SMS_SEND_STATUS = "system_sms_send_status"; // 短信发送状态
     String SMS_RECEIVE_STATUS = "system_sms_receive_status"; // 短信接收状态
 
+    String SYSTEM_ROLE_TYPE = "system_role_type"; // 短信接收状态
+
     String SYSTEM_AREA_DEEP = "system_area_deep"; // 地区级别：0 省 1 市 2 区县
     /**
      * 库存性质

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/permission/vo/role/RoleRespVO.java

@@ -18,41 +18,44 @@ import java.util.Set;
 public class RoleRespVO {
 
     @Schema(description = "角色编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("角色序号")
+    @ExcelProperty("角色编号")
     private Long id;
 
     @Schema(description = "角色名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "管理员")
     @ExcelProperty("角色名称")
     private String name;
 
-    @Schema(description = "角色标志", requiredMode = Schema.RequiredMode.REQUIRED, example = "admin")
-    @NotBlank(message = "角色标志不能为空")
-    @ExcelProperty("角色标志")
+    @Schema(description = "角色类型，参见 RoleTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @DictFormat(DictTypeConstants.SYSTEM_ROLE_TYPE)
+    @ExcelProperty(value = "角色类型", converter = DictConvert.class)
+    private Integer type;
+
+    @Schema(description = "角色标识", requiredMode = Schema.RequiredMode.REQUIRED, example = "admin")
+    @NotBlank(message = "角色标识不能为空")
+    @ExcelProperty("角色标识")
     private String code;
 
     @Schema(description = "显示顺序", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    @ExcelProperty("角色排序")
+    @ExcelProperty("显示顺序")
     private Integer sort;
 
+    @Schema(description = "备注", example = "我是一个角色")
+    @ExcelProperty("备注")
+    private String remark;
+
     @Schema(description = "状态，参见 CommonStatusEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty(value = "角色状态", converter = DictConvert.class)
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.COMMON_STATUS)
     private Integer status;
 
-    @Schema(description = "角色类型，参见 RoleTypeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer type;
-
-    @Schema(description = "备注", example = "我是一个角色")
-    private String remark;
-
     @Schema(description = "数据范围，参见 DataScopeEnum 枚举类", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @ExcelProperty("数据范围")
     private Integer dataScope;
 
     @Schema(description = "数据范围(指定部门数组)", example = "1")
     private Set<Long> dataScopeDeptIds;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED, example = "时间戳格式")
+    @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
 }