chenxinying
|
7a077fae5d
|
行车三检承运地显示
|
2024-03-22 15:07:30 +08:00 |
 wangpeng
|
aa8e404b5d
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-22 14:54:02 +08:00 |
|
wangpeng
|
16c7d7aa24
|
从业人员管理
|
2024-03-22 14:53:46 +08:00 |
|
chenxinying
|
b43cb8ecc1
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
|
2024-03-22 14:53:19 +08:00 |
WenShiJun
|
eb8c8d0129
|
运单登记新增优化
地点管理优化
客户管理优化
|
2024-03-22 14:34:59 +08:00 |
|
chenxinying
|
fb0e2acefb
|
行车三检
|
2024-03-22 14:11:24 +08:00 |
 zhangyanli
|
58494b827d
|
教培功能
|
2024-03-22 09:44:33 +08:00 |
|
zhangyanli
|
e1718a3f6a
|
教培功能
|
2024-03-22 09:43:26 +08:00 |
|
zhangyanli
|
70002e33a7
|
教培功能
|
2024-03-22 09:38:57 +08:00 |
|
zhangyanli
|
7f8b9402ce
|
教培功能
|
2024-03-22 09:37:32 +08:00 |
|
WenShiJun
|
29dee5bfd2
|
运单登记列表sql优化
|
2024-03-21 08:54:55 +08:00 |
|
WenShiJun
|
c93b8b8801
|
Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
# src/main/java/com/zcloud/mapper/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.java
# src/main/java/com/zcloud/service/comprehensive/TrafficSecurityWaybillRegistrationService.java
# src/main/java/com/zcloud/service/comprehensive/impl/TrafficSecurityWaybillRegistrationServiceImpl.java
# src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityWaybillRegistrationMapper.xml
|
2024-03-21 08:43:37 +08:00 |
|
WenShiJun
|
7558066cb4
|
安全生产月活动，安全知识手册模块开发
运单登记，地点管理模块优化
|
2024-03-21 08:42:15 +08:00 |
|
chenxinying
|
d282d1a2a7
|
行车三检
|
2024-03-20 17:02:31 +08:00 |
 xiepeng
|
8feddb6b97
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-19 14:03:05 +08:00 |
|
xiepeng
|
05ff67e6fd
|
过户管理
报废管理
企业安全生产值班记录
生产设备设施台账
劳动防护用品发放记录
消防设备设施台账
上报事件处理台账
|
2024-03-19 14:02:24 +08:00 |
|
WenShiJun
|
c40c8fe706
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-15 17:52:54 +08:00 |
|
WenShiJun
|
2311b8333a
|
生产安全事故档案模块开发
|
2024-03-15 17:52:47 +08:00 |
 277151821@qq.com
|
326a5024ef
|
营运管理
|
2024-03-15 11:26:18 +08:00 |
|
277151821@qq.com
|
e32470182b
|
维保管理
|
2024-03-15 11:25:36 +08:00 |
|
277151821@qq.com
|
e3b792417a
|
保险管理
|
2024-03-15 11:24:29 +08:00 |
|
277151821@qq.com
|
3e79f43c2f
|
年检管理
|
2024-03-15 11:23:46 +08:00 |
|
277151821@qq.com
|
7476fb62b3
|
北斗管理
|
2024-03-15 11:21:18 +08:00 |
|
xiepeng
|
51f5ad594b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-14 09:05:03 +08:00 |
|
xiepeng
|
d21ddeeb85
|
过户管理 报废管理
|
2024-03-14 09:04:40 +08:00 |
|
WenShiJun
|
5b3891263a
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-13 18:03:48 +08:00 |
|
WenShiJun
|
88dc82a3bd
|
岗位安全承诺书、责任书，职业危害告知书，管理人员配备，安全生产目标，安全责任制考核模块开发，优化
|
2024-03-13 18:03:41 +08:00 |
|
zhangyanli
|
c7cfb27443
|
共通信息
|
2024-03-13 08:41:46 +08:00 |
|
zhangyanli
|
cf3c099a38
|
教培信息
|
2024-03-12 17:20:55 +08:00 |
|
zhangyanli
|
ddb8a559d4
|
共通信息
|
2024-03-12 09:11:09 +08:00 |
|
WenShiJun
|
a5d9ae30fc
|
Merge remote-tracking branch 'origin/dev' into dev
|
2024-03-11 18:10:30 +08:00 |
|
WenShiJun
|
ae5bcebb97
|
安全例会优化
岗位安全责任书开发
岗位安全承诺书开发
|
2024-03-11 18:10:24 +08:00 |
|
zhangyanli
|
91146e106c
|
Merge branch 'dev-new' of http://47.92.113.182:3000/wangpeng/integrated_traffic into dev
|
2024-03-11 09:03:29 +08:00 |
|
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 |