Commit Graph

140 Commits

Author SHA1 Message Date
c8f20c3a5c Merge remote-tracking branch 'origin/dev' into dev 2026-01-06 14:39:12 +08:00
529c4720fb update 多级子表的新增和保存 2026-01-06 14:33:02 +08:00
c4b28037f0 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev
# Conflicts:
#	itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/AddLngContractFactRelDto.java
#	itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/LngContractPageDto.java
#	itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/dto/UpdateLngContractFactRelDto.java
#	itc-pcitc-mdm/itc-pcitc-mdm-api/src/main/java/com/xjrsoft/module/contract/vo/LngContractFactRelVo.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/entity/LngContractFactRel.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/contract/mapper/LngContractFactRelMapper.java
2026-01-06 10:18:08 +08:00
005119b53e 修改 2026-01-06 10:02:27 +08:00
3d26c74d9a update 2026-01-04 11:37:00 +08:00
839da1d831 update 2025-12-31 17:05:57 +08:00
e7d0f4b167 update 2025-12-31 10:43:46 +08:00
25418aa738 生成ContractPurPng代码 2025-12-31 09:19:45 +08:00
a4fa3d1f31 update 2025-12-30 14:41:41 +08:00
3b61739cd5 Merge remote-tracking branch 'origin/dev' into dev 2025-12-30 09:20:26 +08:00
6361342e5a 查询联行号 2025-12-30 09:19:37 +08:00
b0c50ceba3 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-29 17:49:51 +08:00
9f21376ab2 修改 2025-12-29 17:47:41 +08:00
c09d2d5590 Merge remote-tracking branch 'origin/dev' into dev 2025-12-29 16:36:17 +08:00
dc8644f6be 转换 2025-12-29 16:33:58 +08:00
c6e915a867 修改 2025-12-29 15:59:50 +08:00
b4154934c0 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-26 11:18:00 +08:00
efeb6689a3 修改 2025-12-26 11:14:20 +08:00
faa34a8c12 银行转换 2025-12-26 11:00:55 +08:00
7935e43118 修改 2025-12-25 17:45:44 +08:00
4a075272d6 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-24 17:31:10 +08:00
0cb12bbf0e 修改 2025-12-24 17:24:03 +08:00
5ef2314e9d 去掉Logfeild注解 name中的刮号 2025-12-24 15:34:48 +08:00
66be2a41de 字段更新策略 2025-12-24 14:23:03 +08:00
673a8051d4 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-23 18:06:37 +08:00
411184019b 部门、用户转换 2025-12-23 18:03:09 +08:00
6180013451 修改 2025-12-23 17:06:17 +08:00
cc29187b1e Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-23 12:15:42 +08:00
a852427550 --修改了启用和做法逻辑,将代码处理添加到了后台中 2025-12-23 11:12:32 +08:00
55f1e00075 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-23 09:43:34 +08:00
f7c42d494f 修复bug #789 2025-12-22 17:48:07 +08:00
16092a5a5a Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-22 09:31:34 +08:00
833af2b44e 修改 2025-12-22 09:30:27 +08:00
4b1a419c23 供应商/客户-评价 2025-12-19 17:44:49 +08:00
52af6011df 供应商评价 2025-12-19 16:49:42 +08:00
3c9133a44e 供应商评价 2025-12-19 15:35:38 +08:00
ebcd73e42d 供应商 2025-12-18 18:25:49 +08:00
99f3508cbb 供应商 2025-12-18 17:04:44 +08:00
aff9056f60 Merge remote-tracking branch 'origin/dev' into dev 2025-12-18 15:57:11 +08:00
1b82112b61 供应商 2025-12-18 15:56:24 +08:00
44ec0dc23a Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-18 09:59:03 +08:00
2a9f0bcd13 修改 2025-12-18 09:57:16 +08:00
18a9fa1bf9 供应商管理 2025-12-17 18:03:36 +08:00
9abc415a8a 供应商评价及客户评价-自动生成代码 2025-12-17 17:30:53 +08:00
77f7b3e588 客户管理 2025-12-16 18:05:36 +08:00
484af87d55 客户管理 2025-12-16 17:44:58 +08:00
132003b0a8 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-16 14:18:47 +08:00
e110d372f8 ---添加事件监听测试 2025-12-16 14:18:43 +08:00
ade95e6dd0 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-16 14:15:39 +08:00
4a61c2d0a3 评分体系修改 2025-12-16 14:14:11 +08:00