Commit Graph

34 Commits

Author SHA1 Message Date
6b799fe8ce 修改 2026-02-04 17:25:41 +08:00
466342fec5 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-02-04 10:00:16 +08:00
891111b0be 修改 2026-02-04 09:42:35 +08:00
4393948065 国内LNG销售,日计划管道气销售结算生成代码 2026-02-03 17:58:59 +08:00
c211318fea 国内LNG销售 2026-01-30 17:58:19 +08:00
214520a8e2 Merge remote-tracking branch 'origin/dev' into dev 2026-01-29 18:08:48 +08:00
29c9b0a0ef 国内LNG销售 2026-01-29 17:54:09 +08:00
0b356eb274 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-29 17:41:22 +08:00
6566adc731 国内LNG销售 2026-01-29 17:24:40 +08:00
55ab32736f 国内LNG销售 2026-01-29 16:09:15 +08:00
d585ab5a2e 修改 2026-01-28 18:06:44 +08:00
b410ac7830 Merge remote-tracking branch 'origin/dev' into dev 2026-01-27 17:31:58 +08:00
62e9134209 列表返回字段添加createUserId 2026-01-27 17:31:33 +08:00
317b0020e3 修改 2026-01-27 16:34:08 +08:00
f6b11facf9 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-16 12:25:06 +08:00
db1e49ff51 币种转换 2026-01-16 11:13:57 +08:00
36dcdac894 修改 2026-01-15 17:56:37 +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
c8d4f26279 修改 2026-01-07 17:44:42 +08:00
0329f40727 update 2026-01-06 18:18:34 +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
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
c6e915a867 修改 2025-12-29 15:59:50 +08:00
efeb6689a3 修改 2025-12-26 11:14:20 +08:00
55b13baef2 修改 2025-12-25 18:10:01 +08:00
7935e43118 修改 2025-12-25 17:45:44 +08:00
0cb12bbf0e 修改 2025-12-24 17:24:03 +08:00