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 |
|
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 |
|
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 |
|
huangyuxuan
|
ab86e2d7c4
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-09-03 15:24:27 +08:00 |
|
water_xu
|
a8205d5963
|
Merge branch 'refs/heads/dev' into pet
|
2024-08-29 10:08:09 +08:00 |
|
water_xu
|
94ff24d671
|
人员中台 - 对接企业、组相关代码以及接口变动
|
2024-08-22 18:51:58 +08:00 |
|
water_xu
|
7607af75da
|
Merge branch 'refs/heads/pet' into dev
|
2024-08-15 15:54:37 +08:00 |
|
water_xu
|
eb19ec1372
|
Merge branch 'refs/heads/xuyifeng-0724-人员中台对接-dev' into pet
|
2024-08-15 15:53:11 +08:00 |
|
water_xu
|
b4c139a067
|
人员中台 - 配置更新
|
2024-08-15 15:47:28 +08:00 |
dingqiang
|
8ec28a3c4c
|
更新
|
2024-08-15 08:55:13 +08:00 |
|
water_xu
|
e6b781fa95
|
相关方人员管理 - 相关方人员审批搜索功能不能使用,搜索信息添加姓名
|
2024-08-14 17:09:27 +08:00 |
|
water_xu
|
021b19d85e
|
人员中台 - 人员中台管理列表查询逻辑修改
|
2024-08-14 17:03:52 +08:00 |
|
water_xu
|
2b3510591b
|
人员中台 - MQ日志补全&相关方用户更新逻辑
|
2024-08-12 10:15:37 +08:00 |
|
water_xu
|
3fc60743f2
|
人员中台 - 切面、MQ通知、MQ监听
|
2024-08-09 17:09:48 +08:00 |
|
water_xu
|
f05613efad
|
Merge branch 'refs/heads/liujun-2024-05-23-接口漏洞修复' into dev
|
2024-07-31 16:40:42 +08:00 |
|
water_xu
|
0d53cd65d9
|
Merge branch 'refs/heads/pet' into dev
|
2024-07-30 16:12:33 +08:00 |
|
water_xu
|
f579b75a92
|
相关方 - 相关方统计报表相关接口
|
2024-07-30 16:11:51 +08:00 |
|
water_xu
|
a4174fafaa
|
人员中台对接内容
|
2024-07-24 08:41:20 +08:00 |
 liujun
|
f4fc8e2f25
|
58服务器重置后，重置配置
|
2024-07-23 13:53:33 +08:00 |
|
water_xu
|
b8732cb711
|
Merge branch 'refs/heads/liujun-2024-06-20-工匠学员对接' into dev
|
2024-07-22 09:03:48 +08:00 |
|
water_xu
|
7942dca1be
|
工匠学院 - 更新测试地址
|
2024-07-20 10:06:52 +08:00 |
|
water_xu
|
c083f6a253
|
工匠学院 - 修改为正式地址
|
2024-07-17 16:39:27 +08:00 |
|
water_xu
|
a29eccbca7
|
Merge branch 'refs/heads/liujun-2024-06-20-工匠学员对接' into dev
|
2024-07-17 16:37:51 +08:00 |
guoyuepeng
|
6f6c3a4862
|
1.正式地址修改
|
2024-07-16 17:09:19 +08:00 |
|
water_xu
|
a5fc9d9eff
|
合并分支 & 配置更新
|
2024-07-16 16:55:43 +08:00 |
|
water_xu
|
fd44935849
|
Merge branch 'refs/heads/pet' into dev
|
2024-07-16 16:55:20 +08:00 |
|
water_xu
|
9709c99b30
|
隐患治理 - 一般隐患台账搜索条件增加是否相关方
|
2024-07-15 16:12:03 +08:00 |
|
water_xu
|
1e92be6166
|
重点工程 - 处罚管理关键字搜索支持处罚原因以及下发人
|
2024-07-15 15:40:58 +08:00 |
|
water_xu
|
0b3ed821d5
|
重点工程 - App端隐患管理、处罚管理角标以及预留只查看自己下发的处罚信息case
|
2024-07-11 15:17:33 +08:00 |
|
water_xu
|
9d98be6430
|
工匠学院 - 祸水东引，给工匠学院找点儿事（优化报错信息）
|
2024-07-10 17:39:40 +08:00 |
|
water_xu
|
13ab1247b6
|
工匠学院 - 工匠学院图片前缀配置更新
|
2024-07-10 16:31:30 +08:00 |
|
water_xu
|
e7a80afd1d
|
相关方人员审批 - 完善报错信息及错误提示
|
2024-07-10 14:17:46 +08:00 |
|
water_xu
|
862d5ce345
|
相关方人员审批 - 完善事务处理机制以及推送失败的友好提示
|
2024-07-09 15:43:49 +08:00 |
|
water_xu
|
a310e9d409
|
Merge branch 'refs/heads/pet' into liujun-2024-06-20-工匠学员对接
# Conflicts:
# src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java
# src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java
# src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java
# src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java
# src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java
|
2024-07-05 17:11:31 +08:00 |
|
water_xu
|
ae76781cf9
|
线上环境数据库改回
|
2024-07-05 16:32:23 +08:00 |
|
water_xu
|
31fda57c0d
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-07-05 16:18:37 +08:00 |
|
water_xu
|
32f94d9cf1
|
安全环保检查 - App端的安全环保检查确认时的空指针bug修复
|
2024-07-05 16:18:28 +08:00 |
 guoyuepeng
|
b8480d2457
|
Merge pull request 'pet' (#22) from pet into dev
Reviewed-on: #22
|
2024-07-02 17:00:51 +08:00 |
|
guoyuepeng
|
2fe234defa
|
Merge remote-tracking branch 'origin/pet' into pet
|
2024-07-02 16:59:36 +08:00 |
|
guoyuepeng
|
15f1a8240d
|
Merge branch 'dev' into pet
|
2024-07-02 16:59:15 +08:00 |
|
water_xu
|
875f37ee50
|
工匠学院 - 推送人员数据时补全img路径前缀
|
2024-07-02 16:05:30 +08:00 |
|
liujun
|
98d303bc66
|
Merge remote-tracking branch 'origin/pet' into dev
|
2024-07-02 15:15:11 +08:00 |
|
liujun
|
eba8aec968
|
Merge branch 'liujun-2024-06-06-相关方新需求' into pet
# Conflicts:
# src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java
# src/main/resources/application-local.properties
|
2024-07-02 14:57:55 +08:00 |
|
liujun
|
c8a22f8189
|
一公司边界入侵企业端代码未与监管端代码统一问题修复
|
2024-06-28 22:21:30 +08:00 |