 zhangyanli
|
55617c2e0f
|
Merge branch 'dev-new' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev
|
2024-03-11 08:46:31 +08:00 |
|
zhangyanli
|
9d056791a7
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/application.properties
|
2024-03-11 08:42:54 +08:00 |
WenShiJun
|
9fc2b68dc2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-08 18:05:34 +08:00 |
|
WenShiJun
|
c114942d3a
|
新增劳务聘用合同，岗位安全责任书，职业危害告知书
安全例会优化
|
2024-03-08 18:05:27 +08:00 |
zhangqihang
|
9af841b8c9
|
教培去除部分企业
|
2024-03-08 18:01:32 +08:00 |
 xiepeng
|
5ef28f2aa2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-08 17:44:00 +08:00 |
|
xiepeng
|
5bd22ec032
|
过户管理
|
2024-03-08 17:43:31 +08:00 |
|
zhangyanli
|
b4aecc440a
|
教培信息
|
2024-03-08 08:50:53 +08:00 |
 277151821@qq.com
|
4daa25f275
|
年检管理列表增加倒叙排序
|
2024-03-07 11:37:58 +08:00 |
|
277151821@qq.com
|
c83fc2a5b4
|
年检管理修改
|
2024-03-07 11:25:28 +08:00 |
|
277151821@qq.com
|
cb0952eae5
|
后端修改
|
2024-03-07 11:06:17 +08:00 |
|
xiepeng
|
14674ea26c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-07 10:24:08 +08:00 |
|
xiepeng
|
a2576d4258
|
运营车辆 修改 车船税
|
2024-03-07 10:23:53 +08:00 |
|
zhangyanli
|
1ac6f197c0
|
共通信息
|
2024-03-07 09:32:30 +08:00 |
|
zhangyanli
|
0b7b42197b
|
共通信息
|
2024-03-06 17:56:01 +08:00 |
|
zhangyanli
|
ab39dd7e0b
|
共通信息
|
2024-03-06 17:38:52 +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 |
|
WenShiJun
|
6298ab6596
|
安全例会模块优化->查看人员列表页，详情页
|
2024-03-06 16:10:05 +08:00 |
|
277151821@qq.com
|
63ab771a02
|
后端修改
|
2024-03-06 12:25:55 +08:00 |
|
xiepeng
|
ece25c0daf
|
运营车辆
|
2024-03-06 10:28:52 +08:00 |
|
xiepeng
|
a893aa83b2
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-06 09:41:34 +08:00 |
|
xiepeng
|
42b42a208d
|
运营车辆
|
2024-03-06 09:41:06 +08:00 |
|
WenShiJun
|
8316b09a48
|
安全例会模块优化
|
2024-03-05 18:14:36 +08:00 |
 wangpeng
|
04b40acb8d
|
变更附件主目录
|
2024-03-05 16:49:04 +08:00 |
|
wangpeng
|
1bc503f3cb
|
变更附件主目录
|
2024-03-05 16:47:52 +08:00 |
|
277151821@qq.com
|
654802b461
|
后端修改
|
2024-03-05 12:00:06 +08:00 |
|
277151821@qq.com
|
3d1a78869c
|
后端修改
|
2024-03-05 11:36:33 +08:00 |
|
277151821@qq.com
|
d96a569e66
|
撤销修改
|
2024-03-05 11:12:37 +08:00 |
|
277151821@qq.com
|
b244cb0985
|
货运挂车后端
|
2024-03-05 11:08:48 +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 |
|
WenShiJun
|
14e7e11f2a
|
新增从业人员管理相关接口
|
2024-03-01 18:04:06 +08:00 |
chenxinying
|
8482fa7e79
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-01 16:56:10 +08:00 |
|
chenxinying
|
c7e8305bb2
|
八项作业中作业人显示，吊装作业安全措施添加吨数
|
2024-03-01 16:55:50 +08:00 |
|
WenShiJun
|
eddae30465
|
安全通知，客户管理，运单登记，地点管理功能优化
|
2024-03-01 13:52:43 +08:00 |
 fangjiakai
|
b5f20683d4
|
修改人员定位接口地址
|
2024-03-01 12:08:00 +08:00 |
 dearlin
|
f7ebc6a958
|
八项作业与优化三方定位系统后台地址的查询
|
2024-03-01 11:41:16 +08:00 |
|
xiepeng
|
983e857ba9
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-01 10:18:37 +08:00 |
|
xiepeng
|
93e9e8a30b
|
运营车辆
|
2024-03-01 10:01:48 +08:00 |
|
dearlin
|
ee5192518b
|
八项作业与部分bug
|
2024-03-01 09:05:45 +08:00 |
|
WenShiJun
|
48a21ed00d
|
客户管理后端功能优化
新增地点管理后端功能
|
2024-02-29 18:30:26 +08:00 |
|
zhangqihang
|
8dd9ff3390
|
修复bug
|
2024-02-29 15:43:39 +08:00 |
|
chenxinying
|
f26dbe0980
|
吊装作业，断路作业，动土作业，盲板PC端
|
2024-02-29 08:43:27 +08:00 |
|
WenShiJun
|
c12d2c7774
|
安全通知->功能优化
运单登记后端功能
客户管理后端功能
|
2024-02-28 19:16:25 +08:00 |
|
dearlin
|
c70b1d6bf1
|
14132 这几种隐患来源的显示不正确 需要统一
|
2024-02-28 14:26:41 +08:00 |
|
zhangqihang
|
2c3cc96696
|
修复bug
|
2024-02-28 13:45:01 +08:00 |
|
dearlin
|
f90c019094
|
解决了 Bug 打回并删除的数字没有减少 14193
|
2024-02-28 11:51:35 +08:00 |
|
fangjiakai
|
83ef15519c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-02-28 10:45:08 +08:00 |
|
fangjiakai
|
93ca8d2982
|
聚集告警人员列表
|
2024-02-28 10:44:54 +08:00 |
|
dearlin
|
1d855bb46f
|
聚集告警记录bug修复
|
2024-02-28 10:19:17 +08:00 |