|
|
8786b8302e
|
bigdanger修复
|
2025-09-30 17:12:42 +08:00 |
|
|
|
e06cef4d70
|
合并uat冲突修改
|
2025-09-30 09:18:49 +08:00 |
|
|
|
3d7a9774dc
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/WorkTicketOrderController.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
# src/main/java/com/zhgd/xmgl/util/MapUtil.java
# src/main/java/com/zhgd/xmgl/util/WordUtils.java
|
2025-09-30 09:10:27 +08:00 |
|
|
|
64b89dc734
|
合并uat的执法记录仪导出
|
2025-09-29 19:16:42 +08:00 |
|
|
|
4e3fefa0f4
|
工单优化
|
2025-09-29 17:55:22 +08:00 |
|
|
|
7fc738861f
|
工单优化
|
2025-09-29 17:54:58 +08:00 |
|
|
|
5441abe588
|
修改工单bug
|
2025-09-29 17:31:14 +08:00 |
|
|
|
e0eac7bfd2
|
增加工单等其他bug
|
2025-09-29 17:27:03 +08:00 |
|
|
|
98791b9d6c
|
登录改成数字验证码等其他修复
|
2025-09-29 17:23:31 +08:00 |
|
|
|
abb64f8d92
|
增加工单等其他bug
|
2025-09-28 18:36:59 +08:00 |
|
|
|
c2a40ef078
|
《通过http下载文件，并修改名称》处理重复的后缀
|
2025-09-27 16:47:59 +08:00 |
|
|
|
1e38b52511
|
《通过http下载文件，并修改名称》处理重复的后缀
|
2025-09-27 16:45:57 +08:00 |
|
|
|
cbc62ead1c
|
是否启用无插件播放
|
2025-09-27 10:35:02 +08:00 |
|
|
|
9f7f5c3632
|
监控导入不要parentObj
|
2025-09-27 09:22:46 +08:00 |
|
|
|
3cca4e4a1c
|
监控导入不要parentObj
|
2025-09-27 09:22:27 +08:00 |
|
|
|
b7a3e9ff46
|
监控导入设备重名更新
|
2025-09-26 19:25:04 +08:00 |
|
|
|
1e952f6993
|
监控导入设备重名更新
|
2025-09-26 19:24:44 +08:00 |
|
|
|
c7fa730509
|
监控导入设备重名更新
|
2025-09-26 19:17:15 +08:00 |
|
|
|
7018348d79
|
监控导入设备重名更新
|
2025-09-26 19:16:25 +08:00 |
|
|
|
eeeb7cb62e
|
添加项目bug修改
|
2025-09-26 18:30:36 +08:00 |
|
|
|
6de1f82747
|
《通过http下载文件，并修改名称》修改成外网访问就直接用内网替换
|
2025-09-26 18:29:54 +08:00 |
|
|
|
cb497f1e6c
|
添加项目bug修改
|
2025-09-26 18:27:42 +08:00 |
|
|
|
76bbce23bc
|
《通过http下载文件，并修改名称》修改成外网访问就直接用内网替换
|
2025-09-26 18:26:18 +08:00 |
|
|
|
bbfa43e521
|
新危大工程
|
2025-09-26 16:14:52 +08:00 |
|
|
|
d99914d445
|
新危大工程
|
2025-09-26 16:13:33 +08:00 |
|
|
|
316f7f45e3
|
执法记录仪导出
|
2025-09-25 10:38:13 +08:00 |
|
|
|
7340d99c2c
|
执法记录仪导出
|
2025-09-25 10:37:26 +08:00 |
|
|
|
aa429808d5
|
执法记录仪导出
|
2025-09-25 10:35:29 +08:00 |
|
|
|
a24cbd89ba
|
导出图片到excel bug修复
|
2025-09-25 10:32:31 +08:00 |
|
|
|
bc06c9daa1
|
是否启用无插件播放
|
2025-09-22 18:42:21 +08:00 |
|
|
|
0560157c45
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemFileController.java
# src/main/resources/application.properties
|
2025-09-22 18:36:45 +08:00 |
|
|
|
e60344e802
|
批量删除执法记录仪文件信息等修复
|
2025-09-19 19:44:03 +08:00 |
|
|
|
400f5ee2a6
|
批量删除执法记录仪文件信息等修复
|
2025-09-19 19:32:45 +08:00 |
|
|
|
7b3b14f889
|
批量删除执法记录仪文件信息等修复
|
2025-09-19 19:32:11 +08:00 |
|
|
|
43ad1fc4db
|
mcs8下载选择的是http内网、外网
|
2025-09-19 16:52:22 +08:00 |
|
|
|
2a2e42fe5e
|
企业视频增加分组
|
2025-09-19 16:50:04 +08:00 |
|
|
|
f2f27114a8
|
mcs8下载选择的是http内网、外网
|
2025-09-19 16:49:04 +08:00 |
|
|
|
9d32aacaf5
|
企业视频增加分组
|
2025-09-19 16:47:58 +08:00 |
|
|
|
c7668679fa
|
合并分支修改
|
2025-09-19 09:18:36 +08:00 |
|
|
|
5d71396465
|
Merge branch 'uat' into dunhuang
# Conflicts:
# src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java
# src/main/java/com/zhgd/xmgl/modules/basicdata/controller/OperationLogController.java
# src/main/java/com/zhgd/xmgl/security/PermissionEvaluator.java
# src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
|
2025-09-19 09:12:33 +08:00 |
|
|
|
85ab953526
|
加上apk
|
2025-09-19 09:04:55 +08:00 |
|
|
|
3ea38f4805
|
bug修复
|
2025-09-18 18:39:42 +08:00 |
|
|
|
1f02242018
|
四色图接口
|
2025-09-18 18:39:04 +08:00 |
|
|
|
9945b42b9c
|
in权限bug修复
|
2025-09-18 18:06:17 +08:00 |
|
|
|
d774589549
|
mcu8的token失败重试
|
2025-09-17 13:44:57 +08:00 |
|
|
|
dcb707708d
|
合并管理员权限bug修复
|
2025-09-17 13:44:38 +08:00 |
|
|
|
c08de3102b
|
管理员权限bug修复
|
2025-09-17 13:41:02 +08:00 |
|
|
|
1c5e568e5b
|
mcu8的token失败重试
|
2025-09-17 11:38:29 +08:00 |
|
|
|
46317684a3
|
桥机修复
|
2025-09-16 10:34:35 +08:00 |
|
|
|
004a5f4844
|
WorkTicketType权限修复
|
2025-09-16 10:00:27 +08:00 |
|
