diff --git a/pom.xml b/pom.xml index 5be727c..0e4315f 100644 --- a/pom.xml +++ b/pom.xml @@ -10,10 +10,10 @@ 8.0.28 2.3.1 2.0.8 - 1.5.8 + 1.5.13 1.25.0 1.6.2 - 3.8.1 + 3.18.0 4.0.0 1.15.3 2.5.1 @@ -57,7 +57,7 @@ 4.35.37.ALL - + javax.xml jaxrpc @@ -102,6 +102,12 @@ io.minio minio 8.2.2 + + + com.google.guava + guava + + javax.activation @@ -138,6 +144,17 @@ org.nutz nutzboot-core ${nutzboot.version} + + + org.yaml + snakeyaml + + + + + org.yaml + snakeyaml + 2.0 org.nutz @@ -233,6 +250,18 @@ net.unicon.cas cas-client-autoconfig-support 2.3.0-GA + + + org.springframework.boot + spring-boot-starter + + + + + org.springframework.boot + spring-boot-starter + 2.6.15 + compile @@ -319,12 +348,18 @@ com.fasterxml.jackson.core jackson-databind - 2.8.1 + 2.9.4 com.fasterxml.uuid java-uuid-generator 3.1.3 + + + log4j + log4j + + @@ -376,8 +411,18 @@ slf4j-api org.slf4j + + com.google.guava + guava + + + com.google.guava + guava + 32.0.1-jre + compile + com.github.xiaoymin knife4j-openapi2-spring-boot-starter diff --git a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java index a22f56f..670ffae 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java +++ b/src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java @@ -284,8 +284,8 @@ public class ActivityTissue extends BaseModel implements Serializable, SysHomeCo } sysHomeActivity.setH5Url("/platform/h5/activity/culture/signUp?id=" + this.getId()); if (Lang.isNotEmpty(this.getApplyStartTime())) { - sysHomeActivity.setStartDate(DateUtil.parseDate(this.getApplyStartTime())); - sysHomeActivity.setEndDate(DateUtil.parseDate(this.getApplyEndTime())); + sysHomeActivity.setStartDate(DateUtil.parse(this.getApplyStartTime(), "yyyy-MM-dd HH:mm")); + sysHomeActivity.setEndDate(DateUtil.parse(this.getApplyEndTime(), "yyyy-MM-dd HH:mm")); } sysHomeActivity.setAllowUserGroupId(this.getGroupId()); sysHomeActivity.setEnable(this.getIsUnseal()); diff --git a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html index f79f32f..c6cc5c5 100644 --- a/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html +++ b/src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html @@ -156,12 +156,12 @@ layout("/layouts/platform.html"){ computed: { welfareOptions() { if (this.pageForm.projectId) { - return this.projectOptions.find((item) => item.id === this.pageForm.projectId).options + return this.projectOptions.find((item) => item.id === this.pageForm.projectId)?.options } return [] }, provideMode() { - return this.projectOptions.find((item) => item.id === this.pageForm.projectId).provideMode + return this.projectOptions.find((item) => item.id === this.pageForm.projectId)?.provideMode } }, methods: {