1425 Commits

Author SHA1 Message Date
2abfb5c70a bug修改-修改密码 2024-05-12 16:41:39 +08:00
a268b9c747 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-12 15:55:45 +08:00
eb4e39fe13 车辆数据权限查询 2024-05-12 15:54:39 +08:00
841a3001cf bug修改 2024-05-12 15:54:38 +08:00
cb9a541215 项目大屏评分 2024-05-12 12:02:55 +08:00
34dbf92d8f 危大bug修改 2024-05-12 00:50:52 +08:00
6a9a17942b bug修复 2024-05-12 00:11:47 +08:00
6ac97db804 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-11 22:12:58 +08:00
0e9b63d31b bug修改 2024-05-11 22:12:17 +08:00
ca6440d281 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-11 18:12:27 +08:00
8206913696 大屏部分接口 2024-05-11 17:55:41 +08:00
00635295ed Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-11 14:59:03 +08:00
e251badba4 大屏部分接口 2024-05-11 14:03:18 +08:00
db69d7af0c Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong
# Conflicts:
#	src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
2024-05-11 10:44:39 +08:00
7e6ca8110f 测试红外对射和AI识别告警 2024-05-11 10:35:18 +08:00
GUO
d7dd028707 bug修复 2024-05-11 09:08:21 +08:00
c72a2808ec bug修复 2024-05-11 01:58:58 +08:00
4321cbd179 危大工程修改 2024-05-10 20:32:09 +08:00
733fbf7cb6 人员车辆材料修改 2024-05-10 18:21:59 +08:00
13240e72c5 修复bug 2024-05-10 15:25:21 +08:00
bb08951cf8 修复bug 2024-05-10 13:00:32 +08:00
8091c272b0 人员下发修改 2024-05-10 02:48:59 +08:00
GUO
82306238dc bug修复 2024-05-10 00:52:30 +08:00
GUO
5aa2d22342 bug修复 2024-05-10 00:27:54 +08:00
0219883406 bug修复 2024-05-09 21:27:31 +08:00
8af031ea90 bug修复 2024-05-09 18:49:41 +08:00
fe6d8250e7 bug修复 2024-05-09 18:43:37 +08:00
55b10b4c3d 材料批次修改 2024-05-09 16:06:47 +08:00
GUO
2b1e878b0a bug修复 2024-05-09 00:46:08 +08:00
b5755e748e bug修复 2024-05-09 00:21:59 +08:00
6555c13200 bug修复 2024-05-08 23:18:15 +08:00
e2628bb94a bug修复 2024-05-08 17:43:19 +08:00
430e2a6e48 bug修复 2024-05-07 22:49:14 +08:00
GUO
499a6c6936 bug修复 2024-05-07 22:09:33 +08:00
e692cabd10 Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-07 21:39:34 +08:00
1d8c02e7ff bug修复-劳务人员 2024-05-07 21:39:24 +08:00
GUO
f946485114 bug修复 2024-05-07 21:29:52 +08:00
GUO
052a59bbd6 bug修复 2024-05-07 20:39:25 +08:00
17098be966 劳务人员-准入台账信息 2024-05-07 19:46:49 +08:00
GUO
9c4a9cf981 redisson分布式锁 2024-05-07 19:45:36 +08:00
GUO
dfa1adfd79 bug修复 2024-05-07 15:52:17 +08:00
GUO
c4a2f9876f Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-07 15:45:26 +08:00
GUO
9d85ce9ce6 bug修复 2024-05-07 15:43:03 +08:00
459f1ab5e4 材料批次修改 2024-05-07 15:02:15 +08:00
GUO
b333e21a1a Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong 2024-05-07 10:59:18 +08:00
6ae7f9a4f8 修复 2024-05-07 10:35:42 +08:00
GUO
04837c512b bug修复 2024-05-07 10:34:36 +08:00
777b88ea45 增加消息通知,修改抄送部门 2024-05-07 10:26:57 +08:00
GUO
84b196d088 bug修复 2024-05-07 09:21:18 +08:00
c5ea8e40ef bug修复 2024-05-07 00:00:47 +08:00