Commit Graph

271 Commits

Author SHA1 Message Date
36dcdac894 修改 2026-01-15 17:56:37 +08:00
377753c478 update 2026-01-13 17:04:56 +08:00
e39ef931b2 修改 2026-01-13 16:17:00 +08:00
ad9778e473 Merge remote-tracking branch 'origin/dev' into dev 2026-01-12 18:07:26 +08:00
c4db8ce0ac update 2026-01-12 18:05:31 +08:00
a02370dd6f Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-12 17:57:06 +08:00
1956179c08 修改 2026-01-12 17:31:21 +08:00
d118b1db45 update 2026-01-12 15:02:00 +08:00
c64cfb90e9 Merge remote-tracking branch 'origin/dev' into dev 2026-01-12 13:35:13 +08:00
6ac9486ae4 update 2026-01-12 13:32:03 +08:00
b0982c80b0 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-09 18:06:12 +08:00
7db2287515 修改 2026-01-09 17:58:25 +08:00
47f675f9b6 管道气采购 2026-01-09 15:57:47 +08:00
402c876e86 去除多余打印日志 2026-01-09 08:56:09 +08:00
7c084fbcdd 国内管道气采购 2026-01-08 17:03:39 +08:00
a08c3d1273 国内管道气采购 2026-01-08 16:43:08 +08:00
3dee417d2f Merge remote-tracking branch 'origin/dev' into dev 2026-01-07 17:59:39 +08:00
e44632c5f6 update 2026-01-07 17:55:22 +08:00
7ee4d9a774 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-07 17:47:47 +08:00
c8d4f26279 修改 2026-01-07 17:44:42 +08:00
3f9c164588 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-07 17:32:45 +08:00
11ffd0f08f --- 2026-01-07 17:32:41 +08:00
0329f40727 update 2026-01-06 18:18:34 +08:00
b9bf9a62a5 国内采购合同分页列表查询 2026-01-06 17:47:03 +08:00
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
827d972a48 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-04 11:47:35 +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
4f6a812747 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-30 17:05:13 +08:00
ab0d3adb15 修改 2025-12-30 17:02:51 +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
7605c7f6be Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-29 17:54:33 +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
3956c8044c Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-12-29 10:14:32 +08:00
e28764c90e ---- 2025-12-29 10:14:26 +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
28737e848b Merge remote-tracking branch 'origin/dev' into dev 2025-12-26 11:01:53 +08:00
faa34a8c12 银行转换 2025-12-26 11:00:55 +08:00