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