wangpeng
/
integrated_traffic
forked from integrated_whb/integrated_whb
1
0
Fork 0
Code Pull Requests Activity
382 Commits
3 Branches
0 Tags
52 MiB
Commit Graph

382 Commits (8f80812d53e2b48b99b6d7f5447886e673ba3b99)

Author SHA1 Message Date
WenShiJun 8f80812d53 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/mybatis/datasource/firefightingEquipmentFacility/FirefightingEquipmentFacilityMapper.xml
#	src/main/resources/mybatis/datasource/reportedIncident/ReportedIncidentMapper.xml
#	src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml
 2024-03-28 18:35:14 +08:00
WenShiJun b47e7d647b Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/freighttrailer/FreighttTrailerController.java
 2024-03-28 18:33:55 +08:00
xiepeng 86d82ec17e BUG优化 2024-03-28 18:32:23 +08:00
WenShiJun 4763b042a0 交通一体化bug优化 2024-03-28 18:32:18 +08:00
xiepeng 7fd34a34bb Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/mybatis/datasource/comprehensive/TrafficSecurityAccidentInvestigationMapper.xml
 2024-03-27 18:13:10 +08:00
xiepeng db4cba9b2b BUG优化 2024-03-27 18:10:54 +08:00
WenShiJun b5fa3fae2e Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/resources/mybatis/datasource/taxationManage/TaxationManageMapper.xml
 2024-03-27 18:06:28 +08:00
WenShiJun afdce2f5f2 bug优化 2024-03-27 18:05:14 +08:00
wangpeng a704b4e1bb 移除jar包 2024-03-27 16:42:46 +08:00
zhangyanli ba5c9534ad 教培功能bug修复 2024-03-27 15:52:48 +08:00
xiepeng c1acfc513f 提醒天数 下拉 2024-03-27 10:04:49 +08:00
xiepeng 5e14be67ed Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/beidou/BeidouController.java
 2024-03-26 18:11:05 +08:00
xiepeng 2fdcc017fe 修改车牌号、车架号、发动机号校验 
图片显示
 2024-03-26 18:06:10 +08:00
WenShiJun 2e121cfabc bug优化 2024-03-26 18:01:53 +08:00
WenShiJun d2555a192a Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 11:46:37 +08:00
WenShiJun bf84574073 保险管理，运营管理，维保管理，北斗管理优化 2024-03-25 11:46:07 +08:00
xiepeng 3d1f7acc6d Merge remote-tracking branch 'origin/dev' into dev 2024-03-25 10:20:29 +08:00
zhangyanli 8f9a4b3da8 教培建班 2024-03-25 09:36:21 +08:00
wangpeng c24741bbfb 八项作业代码异常修复 2024-03-25 09:23:17 +08:00
xiepeng 1a61b3f9ab Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	src/main/java/com/zcloud/controller/taxationManage/TaxationManageController.java
 2024-03-25 09:06:59 +08:00
xiepeng 85f4d83469 修改车船税过户显示 营运车辆车牌号唯一 2024-03-25 08:55:44 +08:00
WenShiJun 04dcec4ec5 Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 17:17:26 +08:00
WenShiJun 0e9eeee54d 年检管理，保险管理新增优化 2024-03-22 17:17:17 +08:00
chenxinying 3146682bbc Merge remote-tracking branch 'origin/dev' into dev 2024-03-22 15:07:34 +08:00
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