Merge remote-tracking branch 'origin/master'

src/main/java/com/lq/entity/SysPermission.java

@@ -1,6 +1,5 @@
 package com.lq.entity;
 
-import com.lq.code.annotation.Length;
 import com.lq.code.entity.IdEntity;
 
 /** 权限表
@@ -11,9 +10,16 @@ public class SysPermission extends IdEntity{
     /**
      * 权限名称
      */
-
-    @Length(value = 80)
     private String name;
+    /**
+     *  权限类型
+     */
+    private int permissionType;
+    /**·
+     *  权限键值
+     */
+    private String permissionKey;
+
 
     public String getName() {
         return name;
@@ -23,4 +29,19 @@ public class SysPermission extends IdEntity{
         this.name = name;
     }
 
+    public int getPermissionType() {
+        return permissionType;
+    }
+
+    public void setPermissionType(int permissionType) {
+        this.permissionType = permissionType;
+    }
+
+    public String getPermissionKey() {
+        return permissionKey;
+    }
+
+    public void setPermissionKey(String permissionKey) {
+        this.permissionKey = permissionKey;
+    }
 }

src/main/resources/dev/jdbc.properties

@@ -1,6 +1,6 @@
 #--------- jdbc 配置---------
 jdbc.driver=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/ssm?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8
+jdbc.url=jdbc:mysql://192.168.31.19:3306/ssm?useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8
 jdbc.user=root
 jdbc.password=mysql
 #--------数据库连接池配置 -------