diff --git a/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java b/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java index ed17870..1827742 100644 --- a/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java +++ b/src/main/java/com/budwk/app/base/sms/impl/jshvc/SmsJshvcServiceImpl.java @@ -27,11 +27,11 @@ import java.util.Map; @IocBean public class SmsJshvcServiceImpl implements SmsService { - private static final String APPID = "1430576717768122368"; - private static final String APP_SECRET = "19A0ACB03FBQHL4R4XQD"; - private static final String TOKEN_URL = "https://gateway.jshvc.edu.cn/token/gateway/accessToken"; - private static final String MSG_URL = "https://gateway.jshvc.edu.cn/mp/restful/v2/message/send"; - private static final String REDIS_KEY_MSG_ACCESS_TOKEN = "msg:token:"; + private static final String APPID = ""; + private static final String APP_SECRET = ""; + private static final String TOKEN_URL = ""; + private static final String MSG_URL = ""; + private static final String REDIS_KEY_MSG_ACCESS_TOKEN = ""; @Inject private RedisService redisService; diff --git a/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java b/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java index 50fbbae..73f8c21 100644 --- a/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/activity/family/service/impl/FamilyActivityServiceImpl.java @@ -273,8 +273,8 @@ public class FamilyActivityServiceImpl extends BaseServiceImpl i dao().insert(familyUser); if (StrUtil.isNotBlank(familyUser.getActivityCourseId())) { - TrainSignUpActivityCourse fetch = dao().fetch(TrainSignUpActivityCourse.class, familyUser.getActivityCourseId()); - TrainSignUpUserCourse userCourse = new TrainSignUpUserCourse(); + FamilyActivityCourse fetch = dao().fetch(FamilyActivityCourse.class, familyUser.getActivityCourseId()); + FamilyUserCourse userCourse = new FamilyUserCourse(); userCourse.setActivityId(familyUser.getActivityId()); userCourse.setCourseId(familyUser.getCourseId()); userCourse.setUserId(familyUser.getUserId()); diff --git a/src/main/resources/views/platform/zhgh/activity/family/manage/index.html b/src/main/resources/views/platform/zhgh/activity/family/manage/index.html index 88ba9d2..a165d07 100644 --- a/src/main/resources/views/platform/zhgh/activity/family/manage/index.html +++ b/src/main/resources/views/platform/zhgh/activity/family/manage/index.html @@ -15,6 +15,10 @@ layout("/layouts/platform.html"){ .el-row--flex { align-items: center; } + + .header-left { + display: none !important; + }
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html index 9ed3f4e..4e86e24 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/article/write/index.html @@ -77,6 +77,7 @@ layout("/layouts/platform.html"){ dicts: ["ARTICLE_ORIGIN"], computed: { origins() { + console.log(this.dict,'this.dict') if (this.dict?.type?.ARTICLE_ORIGIN && this.permission && this.permission.roles) { return this.dict.type.ARTICLE_ORIGIN.filter((item) => this.permission && this.permission.roles.includes(item.code)) } diff --git a/src/main/resources/views/platform/zhgh/dayofficework/buildHome/kpi/plan/index.html b/src/main/resources/views/platform/zhgh/dayofficework/buildHome/kpi/plan/index.html index 3b52121..033a0b4 100644 --- a/src/main/resources/views/platform/zhgh/dayofficework/buildHome/kpi/plan/index.html +++ b/src/main/resources/views/platform/zhgh/dayofficework/buildHome/kpi/plan/index.html @@ -52,6 +52,118 @@ layout("/layouts/platform.html"){
+ +