 zhangyanli
|
ba5c9534ad
|
教培功能bug修复
|
2024-03-27 15:52:48 +08:00 |
|
zhangyanli
|
7f8b9402ce
|
教培功能
|
2024-03-22 09:37:32 +08:00 |
|
zhangyanli
|
a2b506427e
|
Merge branch 'dev' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev-new
# Conflicts:
# src/main/java/com/zcloud/controller/archives/ArchivesCapitalController.java
# src/main/java/com/zcloud/controller/archives/ArchivesEduManagerController.java
# src/main/java/com/zcloud/controller/archives/ArchivesEduPlanController.java
# src/main/java/com/zcloud/controller/archives/ArchivesFilesController.java
# src/main/java/com/zcloud/controller/archives/ArchivesPostManController.java
# src/main/java/com/zcloud/controller/archives/ArchivesTeacherController.java
# src/main/java/com/zcloud/controller/courseware/AppCoursewareController.java
# src/main/java/com/zcloud/controller/courseware/DataCoursewareController.java
# src/main/java/com/zcloud/controller/courseware/QuestionController.java
# src/main/java/com/zcloud/controller/courseware/VideoCoursewareController.java
# src/main/java/com/zcloud/controller/curriculum/AppMyCurriculumController.java
# src/main/java/com/zcloud/controller/curriculum/CurriculumController.java
# src/main/java/com/zcloud/controller/curriculum/KcmiddlekjController.java
# src/main/java/com/zcloud/controller/eduArchives/ArchivesPdfFileController.java
# src/main/java/com/zcloud/controller/education/PersonObtainEvidenceController.java
# src/main/java/com/zcloud/controller/education/TrainingInfoController.java
# src/main/java/com/zcloud/controller/education/TrainingPlanController.java
# src/main/java/com/zcloud/controller/paper/StageexampaperInputController.java
# src/main/java/com/zcloud/controller/platformCourseware/PlatformDataCoursewareController.java
# src/main/java/com/zcloud/controller/platformCourseware/PlatformQuestionController.java
# src/main/java/com/zcloud/controller/platformCourseware/PlatformVideoCoursewareController.java
# src/main/java/com/zcloud/controller/platformCurriculum/PlatformCurriculumController.java
# src/main/java/com/zcloud/controller/platformPaper/PlatformStageexampaperInputController.java
# src/main/java/com/zcloud/controller/questionnaire/AppSurveyController.java
# src/main/java/com/zcloud/controller/questionnaire/AppSurveyanswerController.java
# src/main/java/com/zcloud/controller/questionnaire/AppSurveycorpinfoController.java
# src/main/java/com/zcloud/controller/questionnaire/AppSurveyquestionController.java
# src/main/java/com/zcloud/controller/study/AppMfolderStipulateController.java
# src/main/java/com/zcloud/controller/study/MfolderStipulateController.java
# src/main/java/com/zcloud/controller/study/StudySectionController.java
# src/main/java/com/zcloud/controller/study/TempStudyController.java
# src/main/java/com/zcloud/controller/study/VideoController.java
# src/main/java/com/zcloud/controller/system/AppFeedbackController.java
# src/main/java/com/zcloud/controller/task/AppCourseExamController.java
# src/main/java/com/zcloud/controller/task/AppCourseStudentRelationController.java
# src/main/java/com/zcloud/controller/task/AppCourseStudyController.java
# src/main/java/com/zcloud/controller/task/AppCourseStudyVideoRecordController.java
# src/main/java/com/zcloud/controller/task/AppCoursepapersController.java
# src/main/java/com/zcloud/controller/task/AppStageExamController.java
# src/main/java/com/zcloud/controller/task/AppStageStudentRelationController.java
# src/main/java/com/zcloud/controller/task/AppStageexampaperController.java
# src/main/java/com/zcloud/controller/task/AppStudyTaskController.java
# src/main/java/com/zcloud/controller/task/CourseStudyVideoRecordController.java
# src/main/java/com/zcloud/controller/task/StageExamController.java
# src/main/java/com/zcloud/controller/task/StageStudentRelationController.java
# src/main/java/com/zcloud/controller/task/StageexampaperController.java
# src/main/java/com/zcloud/controller/task/StudyTaskController.java
# src/main/java/com/zcloud/controller/video/AIWarningController.java
# src/main/java/com/zcloud/controller/video/AppAudioOrVideoController.java
# src/main/java/com/zcloud/controller/video/AppVideoManagerController.java
# src/main/java/com/zcloud/controller/video/VideoManagerController.java
# src/main/java/com/zcloud/mapper/datasource/corp/CorpInfoMapper.java
# src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
# src/main/java/com/zcloud/mapper/datasource/video/AIWarningMapper.java
# src/main/java/com/zcloud/mapper/datasource/video/VideoManagerMapper.java
# src/main/java/com/zcloud/service/corp/CorpInfoService.java
# src/main/java/com/zcloud/service/corp/impl/CorpInfoServiceImpl.java
# src/main/java/com/zcloud/service/system/DepartmentService.java
# src/main/java/com/zcloud/service/system/UsersService.java
# src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
# src/main/java/com/zcloud/service/video/AIWarningService.java
# src/main/java/com/zcloud/service/video/VideoManagerService.java
# src/main/java/com/zcloud/service/video/impl/AIWarningServiceImpl.java
# src/main/java/com/zcloud/service/video/impl/VideoManagerServiceImpl.java
# src/main/java/com/zcloud/util/Const.java
# src/main/java/com/zcloud/util/DateUtil.java
# src/main/java/com/zcloud/util/InitPageDataUtil.java
# src/main/resources/application.properties
# src/main/resources/mybatis/datasource/system/UsersMapper.xml
|
2024-03-06 16:33:30 +08:00 |
|
zhangyanli
|
6b2a1c9479
|
提交信息
|
2024-03-06 16:25:53 +08:00 |
 wangpeng
|
437c8ccc89
|
Merge pull request 'dev' (#5) from integrated_whb/integrated_whb:dev into dev
Reviewed-on: #5
|
2024-03-04 11:07:07 +08:00 |
zhangqihang
|
4c65e0c6c3
|
修复bug
|
2024-02-28 09:01:16 +08:00 |
|
wangpeng
|
fb3f754bcf
|
Merge pull request 'dev' (#4) from integrated_whb/integrated_whb:dev into dev
Reviewed-on: #4
|
2024-02-27 14:19:06 +08:00 |
WenShiJun
|
fb93851600
|
安全例会->列表，新增，删除，详情接口开发
|
2024-02-26 18:29:43 +08:00 |
|
zhangqihang
|
f16a09c4aa
|
修复bug
|
2024-02-26 15:32:23 +08:00 |
|
WenShiJun
|
ba988ffb42
|
安全通知模块->列表，新增，删除，详情接口开发
|
2024-02-23 19:04:20 +08:00 |
|
zhangqihang
|
acb1c9a5a2
|
修复bug
|
2024-02-23 18:04:02 +08:00 |
|
WenShiJun
|
d77838e897
|
安全环保检查相关bug优化
|
2024-02-19 12:07:37 +08:00 |
 fangjiakai
|
eea6621946
|
地图八项作业
|
2024-02-04 09:14:57 +08:00 |
 dearlin
|
84b0151796
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-01-25 14:20:40 +08:00 |
|
dearlin
|
8187112f9a
|
绑定人员定位卡号
|
2024-01-25 14:20:05 +08:00 |
|
wangpeng
|
9d93529c50
|
权限路由
|
2024-01-24 11:39:18 +08:00 |
|
WenShiJun
|
5c15b857f3
|
新增安全、环保检查管理模块
|
2024-01-22 14:15:49 +08:00 |
|
WenShiJun
|
500456a892
|
PLSUtil工具类新增部分三方接口及封装方法，恢复切换分支后之前优化的bug代码被覆盖的部分代码
|
2024-01-12 16:40:52 +08:00 |
|
WenShiJun
|
0683b752b6
|
Merge branch 'dev' of http://47.92.113.182:3000/integrated_whb/integrated_whb into dev
|
2024-01-11 15:19:18 +08:00 |
|
WenShiJun
|
26a757a44c
|
UsersController层中逻辑迁移至UsersServiceImpl，并新增调用远程新增接口
|
2024-01-11 15:17:27 +08:00 |
|
fangjiakai
|
edb3a21777
|
修改MQ消息发送
|
2024-01-11 09:15:22 +08:00 |
|
fangjiakai
|
0afe99435e
|
整合other mq
|
2024-01-05 08:51:44 +08:00 |
|
fangjiakai
|
3486386421
|
整合prevention
|
2024-01-04 09:07:20 +08:00 |
|
fangjiakai
|
ae68bbf464
|
整合system
|
2024-01-03 11:04:18 +08:00 |
|
fangjiakai
|
af5e6c28e8
|
整合home
|
2024-01-03 09:48:43 +08:00 |