From 6234ca0d596613eb050adba418eff31d53b02cd0 Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Wed, 31 Aug 2022 21:05:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9C=B0=E5=9B=BE=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E5=99=A8=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java | 2 +-
 kicc-register/src/main/resources/bootstrap.yml                  | 1 +
 kicc-ui                                                         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java
index 31736c4e..a2e70ac2 100644
--- a/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java
+++ b/kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/MapTaskPreset.java
@@ -76,7 +76,7 @@ public class MapTaskPreset extends CommonEntity {
     private String mapLogisticId;
 
     @ApiModelProperty("地图任务ID")
-    private String taskId;
+    private String mapTaskId;
 
     @Version
     @ApiModelProperty("版本控制")
diff --git a/kicc-register/src/main/resources/bootstrap.yml b/kicc-register/src/main/resources/bootstrap.yml
index caf04a38..fc897b49 100644
--- a/kicc-register/src/main/resources/bootstrap.yml
+++ b/kicc-register/src/main/resources/bootstrap.yml
@@ -6,6 +6,7 @@ db:
   num: 1
   user: ${MYSQL_USER:root}
   password: ${MYSQL_PWD:root}
+  #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: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
diff --git a/kicc-ui b/kicc-ui
index 24629be8..892883a2 160000
--- a/kicc-ui
+++ b/kicc-ui
@@ -1 +1 @@
-Subproject commit 24629be8aa17a88f32c61a181781310be1e9dea0
+Subproject commit 892883a2a8b0f27d50264da75686f38c21433133