From d6aa8bb0f1915f7d4908cdac92c4483c8711647b Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期五, 30 八月 2024 18:08:57 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java index 66505c7..028c6d1 100644 --- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java +++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDataPermission.java @@ -1,6 +1,7 @@ package com.doumee.dao.system.model; import com.doumee.core.constants.OperaType; +import com.doumee.core.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -22,7 +23,7 @@ @Data @ApiModel("鏁版嵁鏉冮檺閰嶇疆") @TableName("SYSTEM_DATA_PERMISSION") -public class SystemDataPermission implements Serializable { +public class SystemDataPermission extends LoginUserModel implements Serializable { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -39,7 +40,7 @@ @ApiModelProperty(value = "鏉冮檺绫诲瀷锛�0鍏ㄩ儴锛�1鑷畾涔夛紝2浠呯敤鎴锋墍灞烇紝3鐢ㄦ埛鎵�灞炲強鍏跺瓙鏁版嵁锛�", example = "1") @NotNull(message = "鏉冮檺绫诲瀷涓嶈兘涓虹┖", groups = {OperaType.Create.class, OperaType.Update.class}) - private Short type; + private Integer type; @ApiModelProperty(value = "鑷畾涔夋暟鎹�") private String customData; -- Gitblit v1.9.3