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 |
|
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 |
|
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 |
 huangyuxuan
|
7a7a948915
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-05 13:56:39 +08:00 |
|
huangyuxuan
|
1d66e96757
|
修复不兼容阿里JSONUtil
|
2024-09-05 13:51:14 +08:00 |
|
water_xu
|
8e3a6d7615
|
相关方 - 新增河港城发集团单位的培训流程
|
2024-09-05 13:46:30 +08:00 |
|
huangyuxuan
|
5897896094
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-05 11:38:12 +08:00 |
|
water_xu
|
3dfa30514b
|
人员中台 - 收到数据时不修改本地表
|
2024-09-05 11:33:24 +08:00 |
|
WenShiJun
|
f629b35351
|
消防点位管理模块检查记录二维码功能修改
|
2024-09-05 09:25:02 +08:00 |
|
water_xu
|
439eb4fdb0
|
恢复菜单
|
2024-09-04 20:42:01 +08:00 |
|
water_xu
|
370adafd23
|
人员中台 - 配置更新
|
2024-09-04 20:30:21 +08:00 |
|
water_xu
|
26f7bce7a8
|
附件服务器配置更新
|
2024-09-04 20:23:29 +08:00 |
|
water_xu
|
b3ec041f58
|
人员中台 - 人员初始化相关接口
|
2024-09-04 16:20:02 +08:00 |
|
water_xu
|
6ff7afb927
|
弃用阿里JsonUtil 出了个bug
|
2024-09-04 16:17:13 +08:00 |
|
water_xu
|
14adffe1e3
|
人员定位相关对接功能
|
2024-09-04 16:16:35 +08:00 |
|
guoyuepeng
|
db8a7b76be
|
1.八项作业强制回档
|
2024-09-04 11:24:37 +08:00 |
|
WenShiJun
|
83487f4028
|
消防安全管理添加扫码查看检查记录
|
2024-09-03 18:08:40 +08:00 |
|
shanao
|
3e594ab70e
|
优化批量提交
|
2024-09-03 17:51:31 +08:00 |
|
shanao
|
7f1a65f3f7
|
添加注释
|
2024-09-03 17:08:02 +08:00 |
|
huangyuxuan
|
ab86e2d7c4
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-03 15:24:27 +08:00 |
|
shanao
|
eba6660198
|
上传图片代码 测试用例
|
2024-09-02 18:07:40 +08:00 |
|
shanao
|
cbebfd7150
|
修改用户名
|
2024-09-02 16:18:33 +08:00 |
|
wangpeng
|
c15fdba0a7
|
上传 excel 导入 导出 相关代码
|
2024-09-02 16:11:56 +08:00 |
|
water_xu
|
692140c131
|
图片单独上传相关接口 - 文件名分隔后缀判空,默认PNG
|
2024-09-02 10:03:55 +08:00 |
|
wangpeng
|
70c1ee4c3f
|
上传事故调查管理代码
|
2024-08-30 18:07:30 +08:00 |
|
wangpeng
|
73f05b7638
|
上传事故调查管理代码
|
2024-08-30 18:04:21 +08:00 |
|
water_xu
|
a8205d5963
|
Merge branch 'refs/heads/dev' into pet
|
2024-08-29 10:08:09 +08:00 |
|
water_xu
|
6bc2d02cae
|
图片单独上传相关接口
|
2024-08-28 19:01:22 +08:00 |
|
water_xu
|
4c6aa7d8ff
|
Merge branch 'refs/heads/dev' into pet-图片单独上传接口-2024.8.28-徐绎丰
|
2024-08-28 18:42:30 +08:00 |