From 91f173b2090c9125e1bdc83c17ad8ef05ee8cf7f Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Fri, 03 Apr 2020 14:32:22 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java |  126 ++++++++++++++++++++---------------------
 1 files changed, 61 insertions(+), 65 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java
index d4ca6d4..8fac4c9 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-api/src/main/java/com/kidgrow/usercenter/model/SysMenu.java
@@ -1,25 +1,21 @@
 package com.kidgrow.usercenter.model;
 
-import com.kidgrow.common.model.SuperModel;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.kidgrow.common.model.SuperModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.validator.constraints.*;
-import java.util.Date;
+import org.hibernate.validator.constraints.NotEmpty;
 
 /**
  * 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
+ *
+ * @version 1.0
  * @Description: 系统功能菜单表<br>
  * @Project: 用户中心<br>
  * @CreateDate: Created in 2020-04-02 14:02:50 <br>
  * @Author: <a href="4345453@kidgrow.com">liuke</a>
- * @version 1.0
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,61 +23,61 @@
 @AllArgsConstructor
 @TableName("sys_menu")
 public class SysMenu extends SuperModel {
-    private static final long serialVersionUID=1L;
+    private static final long serialVersionUID = 1L;
 
-            /**
-    * 父ID
-    */
-        @NotBlank(message = "父ID不能为空")
-        private Long parentId;
-            /**
-    * 菜单名称
-    */
-        @NotBlank(message = "菜单名称不能为空")
-        private String name;
-            /**
-    * 菜单Url
-    */
-        private String url;
-            /**
-    * 菜单路径
-    */
-        private String path;
-            /**
-    * API 访问模式
-    */
-        private String pathMethod;
-            /**
-    * 样式表
-    */
-        private String css;
-            /**
-    * 排序
-    */
-        @NotBlank(message = "排序不能为空")
-        private Integer sort;
-                    /**
-    * 类型,1菜单,2API资源
-    */
-        @NotBlank(message = "类型,1菜单,2API资源不能为空")
-        private Integer type;
-            /**
-    * 是否显示
-    */
-        @NotBlank(message = "是否显示不能为空")
-        private Integer hidden;
-            /**
-    * 是否删除,1删除,0未删除
-    */
-        @NotBlank(message = "是否删除,1删除,0未删除不能为空")
-        private Integer isDel;
-            /**
-    * 租户字段
-    */
-        private String tenantId;
-            /**
-    * 是否启用,1启用,0停用
-    */
-        @NotBlank(message = "是否启用,1启用,0停用不能为空")
-        private Integer enabled;
-                    }
+    /**
+     * 父ID
+     */
+    @NotEmpty(message = "父ID不能为空")
+    private Long parentId;
+    /**
+     * 菜单名称
+     */
+    @NotEmpty(message = "菜单名称不能为空")
+    private String name;
+    /**
+     * 菜单Url
+     */
+    private String url;
+    /**
+     * 菜单路径
+     */
+    private String path;
+    /**
+     * API 访问模式
+     */
+    private String pathMethod;
+    /**
+     * 样式表
+     */
+    private String css;
+    /**
+     * 排序
+     */
+    @NotEmpty(message = "排序不能为空")
+    private Integer sort;
+    /**
+     * 类型,1菜单,2API资源
+     */
+    @NotEmpty(message = "类型,1菜单,2API资源不能为空")
+    private Integer type;
+    /**
+     * 是否显示
+     */
+    @NotEmpty(message = "是否显示不能为空")
+    private Integer hidden;
+    /**
+     * 是否删除,1删除,0未删除
+     */
+    @NotEmpty(message = "是否删除,1删除,0未删除不能为空")
+    private Integer isDel;
+    /**
+     * 租户字段
+     */
+    private String tenantId;
+    /**
+     * 是否启用,1启用,0停用
+     */
+    @NotEmpty(message = "是否启用,1启用,0停用不能为空")
+    private Integer enabled;
+}

--
Gitblit v1.8.0