diff --git a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
index 764df22d..1b3442a5 100644
--- a/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
+++ b/kicc-platform/kicc-platform-api/kicc-system-api/src/main/java/com/cloud/kicc/system/api/entity/User.java
@@ -50,6 +50,11 @@ public class User extends CommonEntity {
*/
private String password;
+ /**
+ * 用户类型
+ */
+ private String userType;
+
/**
* 机构ID
*/
diff --git a/kicc-register/src/main/resources/bootstrap.yml b/kicc-register/src/main/resources/bootstrap.yml
index fc897b49..3faec1c2 100644
--- a/kicc-register/src/main/resources/bootstrap.yml
+++ b/kicc-register/src/main/resources/bootstrap.yml
@@ -5,10 +5,10 @@ server:
db:
num: 1
user: ${MYSQL_USER:root}
- password: ${MYSQL_PWD:root}
+ password: ${MYSQL_PWD:kanglai@2022}
#password: ${MYSQL_PWD:kanglai@2022}
url:
- 0: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+ 0: jdbc:mysql://${MYSQL_HOST:120.26.168.56}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
#0: jdbc:mysql://${MYSQL_HOST:192.168.3.10}:${MYSQL_PORT:8052}/${MYSQL_DB:kicc_config}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
nacos:
diff --git a/kicc-ui/src/components/AMap/src/Amap.vue b/kicc-ui/src/components/AMap/src/Amap.vue
index 69387ed5..fb875dbe 100644
--- a/kicc-ui/src/components/AMap/src/Amap.vue
+++ b/kicc-ui/src/components/AMap/src/Amap.vue
@@ -31,17 +31,8 @@
-
-
-
-
-
+
+ 打开面板
@@ -49,6 +40,7 @@
+