 shanao
|
0698b28d27
|
添加隐患处理类型等接口
|
2024-10-23 14:18:26 +08:00 |
|
shanao
|
183eef7073
|
将事故事件分离开
|
2024-10-23 14:18:18 +08:00 |
 huangyuxuan
|
93e034b162
|
Merge branch 'refs/heads/hyx_2024-9-27_tongbu' into pet
|
2024-10-21 09:23:22 +08:00 |
|
huangyuxuan
|
059e316156
|
[新增功能](hyx_2024-9-27_tongbu)
|
2024-10-21 08:48:15 +08:00 |
|
huangyuxuan
|
f741535420
|
[新增功能](hyx_2024-9-27_tongbu)
人员信息同步
|
2024-10-12 08:56:20 +08:00 |
|
shanao
|
029399c877
|
新增隐患处理等接口
|
2024-09-30 15:33:42 +08:00 |
|
huangyuxuan
|
6050e94b49
|
datalistPageV3回退
|
2024-09-24 18:30:22 +08:00 |
|
huangyuxuan
|
f7cc015363
|
Merge branch 'pet' into dev
# Conflicts:
# src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
|
2024-09-24 18:20:18 +08:00 |
|
huangyuxuan
|
13448e2af1
|
菜单回退
|
2024-09-24 18:19:25 +08:00 |
|
huangyuxuan
|
432d02c430
|
删除多次提交的代码
|
2024-09-24 17:37:09 +08:00 |
|
huangyuxuan
|
c96c1d60a9
|
代码版本回退
|
2024-09-20 16:54:43 +08:00 |
|
huangyuxuan
|
1ad76f6a87
|
代码版本回退
|
2024-09-20 16:53:36 +08:00 |
|
huangyuxuan
|
f3b7639fcf
|
Merge branch 'hyx_changeFileUpload_2024-9-10' into pet
# Conflicts:
# src/main/java/com/zcloud/controller/filemanager/MfolderController.java
# src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
# src/main/java/com/zcloud/util/Const.java
|
2024-09-20 16:48:04 +08:00 |
|
huangyuxuan
|
5d728f4d16
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-19 14:37:03 +08:00 |
|
huangyuxuan
|
876b63f0e6
|
[新增功能](hyx_changeFileUpload_2024-9-10)
ClearFilesJob.java
- 定时任务改为每日清理30天前的临时文件
DateUtil.java
- 新增 获取30天之前的日期字符串 方法
|
2024-09-19 14:36:11 +08:00 |
|
huangyuxuan
|
785cb0b4e9
|
[新增功能](hyx_changeFileUpload_2024-9-10)
- AppSystemController.java
- 延时监火任务转发下拉选择部门时不选择主企业
- CheckRecordMapper.xml
- ListManagerMapper.xml
- 查询 USER_NAME 时 调用 getUnameByUid函数
- StatisticsDataController.java
- 数据大屏，首页接口不登陆访问
|
2024-09-19 10:02:54 +08:00 |
water_xu
|
3fdd6ee1e6
|
测试环境配置文件更新
|
2024-09-19 09:06:05 +08:00 |
guoyuepeng
|
bd4185fcb7
|
1.消防检查二维码
|
2024-09-19 08:46:49 +08:00 |
|
shanao
|
25752ec5ef
|
死亡人数
|
2024-09-14 22:11:16 +08:00 |
|
shanao
|
d39cf3da87
|
修复时间相差8小时的问题
|
2024-09-14 21:15:25 +08:00 |
|
shanao
|
39f19b3526
|
修改时间类型
|
2024-09-14 20:41:30 +08:00 |
|
shanao
|
cbd2c424dc
|
修改更改
|
2024-09-14 20:17:18 +08:00 |
|
shanao
|
e61cb0b9ea
|
修改更改
|
2024-09-14 19:59:53 +08:00 |
|
shanao
|
415bfd3086
|
修复对象转换问题
|
2024-09-14 19:43:49 +08:00 |
|
water_xu
|
e932aacc86
|
菜单恢复
|
2024-09-14 17:05:11 +08:00 |
WenShiJun
|
32899c9531
|
菜单表恢复
|
2024-09-14 16:59:52 +08:00 |
|
WenShiJun
|
c2068c6ebd
|
消防安全管理添加扫码查看检查记录更新
|
2024-09-14 16:50:01 +08:00 |
|
water_xu
|
9169d4c15e
|
Merge branch 'refs/heads/pet' into dev
# Conflicts:
# src/main/java/com/zcloud/controller/firemanager/app/AppFireRecordController.java
|
2024-09-14 16:34:08 +08:00 |
|
shanao
|
b8dec5280c
|
Merge remote-tracking branch 'origin/dev-shanao' into dev
|
2024-09-14 10:48:53 +08:00 |
|
WenShiJun
|
bc8002876b
|
消防安全管理添加扫码查看检查记录
|
2024-09-14 09:50:07 +08:00 |
|
shanao
|
a455293431
|
Merge remote-tracking branch 'origin/dev-shanao' into pet
|
2024-09-13 17:47:35 +08:00 |
|
shanao
|
eb37f788a7
|
测试完成
|
2024-09-13 17:19:33 +08:00 |
|
shanao
|
69a359ded8
|
修复完所有问题
|
2024-09-12 14:46:20 +08:00 |
|
guoyuepeng
|
b7b228f4b6
|
1.企业端移植门口门禁和人员定位系统
|
2024-09-11 17:33:07 +08:00 |
|
water_xu
|
b319779e4e
|
回滚中台相关代码 删除Json工具类报错
|
2024-09-11 09:50:13 +08:00 |
|
water_xu
|
7925ea2a61
|
回滚中台相关代码
|
2024-09-10 19:54:59 +08:00 |
|
water_xu
|
dc0e4f4374
|
中台ISPUSH默认值为0
|
2024-09-10 18:17:56 +08:00 |
|
shanao
|
2b383e1364
|
修复导出相关问题
|
2024-09-10 18:09:40 +08:00 |
|
huangyuxuan
|
a24771a505
|
[新增功能](hyx_changeFileUpload_2024-9-10)
ClearFilesJob.java
- 定时清除临时文件任务
FileUploadUtil.java
- 上传文件到服务器临时地址
- 临时文件拷贝到正式
MfolderController.java
- 未完成
|
2024-09-10 17:52:05 +08:00 |
|
water_xu
|
7e2077cc48
|
Merge branch 'refs/heads/pet-图片单独上传接口-2024.8.28-徐绎丰' into dev
|
2024-09-10 17:08:13 +08:00 |
|
water_xu
|
2e517e44a3
|
暂时回滚人员中台相关代码
|
2024-09-10 16:51:54 +08:00 |
|
water_xu
|
1cb6ce1c95
|
Revert "人员中台 - 人员初始化相关接口"
This reverts commit b3ec041f58.
|
2024-09-10 15:38:03 +08:00 |
|
shanao
|
dceba5c4b2
|
修复导出相关问题
|
2024-09-10 14:10:42 +08:00 |
|
huangyuxuan
|
683a6be69e
|
显示监管端上传的体系文件
|
2024-09-10 11:47:12 +08:00 |
|
shanao
|
c6ea9844ca
|
修改图片上传方式为Sftp 导出没有调通
|
2024-09-09 18:05:42 +08:00 |
shanao
|
5197b10d4e
|
调试
|
2024-09-08 22:06:08 +08:00 |
|
shanao
|
a5b76b25df
|
优化批量提交
|
2024-09-06 19:38:32 +08:00 |
|
water_xu
|
6e9a25d7f4
|
Merge branch 'refs/heads/pet' into dev
|
2024-09-05 18:27:16 +08:00 |
|
water_xu
|
69a94ef6cc
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-05 14:03:38 +08:00 |
|
water_xu
|
b1a8a3b86f
|
弃用阿里JsonUtil 出了个bug
|
2024-09-05 14:03:28 +08:00 |