1528 Commits

Author SHA1 Message Date
2861adee48 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-28 15:14:15 +08:00
9e487f40f8 车辆修改 2024-05-28 15:14:02 +08:00
984dd5009b 日志 2024-05-28 15:12:50 +08:00
18f5be7b91 日志 2024-05-28 14:05:51 +08:00
efba81b155 车辆调整 2024-05-28 13:55:36 +08:00
GUO
5f4e04251d Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-27 22:59:09 +08:00
GUO
9cccc03f48 bug修改 2024-05-27 22:58:57 +08:00
0151801c58 车辆调整 2024-05-27 22:14:39 +08:00
GUO
be7f25d191 bug修改 2024-05-27 22:06:03 +08:00
GUO
e9f4c16a6a bug修改 2024-05-27 21:58:06 +08:00
GUO
6e04e47781 海康通知修改 2024-05-27 21:46:23 +08:00
GUO
e9fc537c1f 车辆修改 2024-05-27 21:04:46 +08:00
GUO
c026b575e4 车辆修改 2024-05-27 20:53:36 +08:00
GUO
7690223abc 车辆修改 2024-05-27 20:39:35 +08:00
GUO
c7fd8184fe 车辆临时修改 2024-05-27 20:21:03 +08:00
79a76b9c3c 车辆修改 2024-05-27 18:29:52 +08:00
529b033cb3 车辆修改 2024-05-27 18:25:07 +08:00
b5326bb37a 进度分页修复 2024-05-27 18:03:19 +08:00
7a20a6ca47 车辆统计接口 2024-05-27 16:31:26 +08:00
dca2ac1a68 海康状态下发修改 2024-05-27 15:58:14 +08:00
fa165d9c40 日志 2024-05-27 15:42:54 +08:00
fd6ad14792 车辆bug修改 2024-05-27 14:49:44 +08:00
cdb12bc9e0 权限 2024-05-27 14:49:35 +08:00
988880265c Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
# Conflicts:
#	src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java
2024-05-27 14:45:56 +08:00
3c59d123f4 日志 2024-05-27 14:24:38 +08:00
374457baf5 车辆调整 2024-05-27 14:00:54 +08:00
7a2b8f47fe 日志 2024-05-27 13:43:50 +08:00
7f5e9aaa1e 车辆调整 2024-05-27 13:28:32 +08:00
f8c29798f9 企业人员占比 2024-05-27 11:34:25 +08:00
456ffe1b70 改字 2024-05-27 10:23:05 +08:00
9a51dad438 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-26 11:41:45 +08:00
8ed205a4ea 车辆调整 2024-05-26 11:41:19 +08:00
GUO
8b94230d78 bug修复 2024-05-26 00:56:13 +08:00
GUO
8abd1df9b8 join做数据权限 2024-05-26 00:52:32 +08:00
5c1c4d0e72 材料调整 2024-05-25 23:40:04 +08:00
GUO
7af30c9128 安全围栏加区域字段 2024-05-25 23:24:43 +08:00
9b15682cba Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-25 22:36:58 +08:00
a2ca7e1351 材料调整 2024-05-25 22:05:38 +08:00
335232416a Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-25 21:51:57 +08:00
GUO
a6674264c4 安全围栏加区域字段 2024-05-25 21:49:29 +08:00
1c3a62827b 任务做权限 2024-05-25 18:30:12 +08:00
efbf57c142 测试权限 2024-05-25 18:29:51 +08:00
75333c2b8c ai预警的推送 2024-05-25 17:43:40 +08:00
fc06d493b5 安全和质量记录的导出 2024-05-25 17:43:28 +08:00
915422a8d3 ai推送相应的人 2024-05-25 15:56:29 +08:00
3ba4de4414 打印日志 2024-05-25 14:01:30 +08:00
bfdb6c6977 VR安全体验和安全宝接口 2024-05-25 13:47:44 +08:00
dbee0f9d41 打印日志 2024-05-25 10:18:50 +08:00
07e1da5ea2 安全和质量导出bug修改 2024-05-25 10:18:41 +08:00
ec00346349 移动巡检目录 2024-05-24 23:59:48 +08:00