c-zhouhf1/zhgh_jshvc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://dd3skj.picp.vip/JyuHsin/zhgh_jshvc

Browse Source
This commit is contained in:
JyuHsin
2026-03-09 10:12:11 +08:00
parent 95510e253c 790180c21f
commit 09c81f2b82
3 changed files with 54 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/budwk/app/zhgh/activity/culture/models/ActivityTissue.java
+2 -2
View File
@@ -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());
src/main/resources/views/platform/zhgh/welfare/selectionSituation/index.html
+2 -2
View File
@@ -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: {