Commit Graph

141 Commits

Author SHA1 Message Date
55ab32736f 国内LNG销售 2026-01-29 16:09:15 +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
1875bc455a 日计划管理-客户需求 2026-01-23 16:13:27 +08:00
664579d041 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-23 09:54:43 +08:00
b9aa05e397 ---优化docker镜像打包 2026-01-23 09:54:38 +08:00
f5f584981a 日计划管理-客户需求 2026-01-22 16:13:38 +08:00
0b50834d08 日计划管理-客户需求 2026-01-21 15:06:57 +08:00
989dd66a20 Merge remote-tracking branch 'origin/dev' into dev 2026-01-20 18:12:44 +08:00
7137c616f9 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-20 18:02:02 +08:00
31e2b096c2 修改 2026-01-20 18:00:24 +08:00
58df623462 日计划管理-客户需求 2026-01-20 17:53:31 +08:00
693afa590a Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-20 17:38:15 +08:00
c96a0f3023 ---修复关联关系一对多bug 2026-01-20 17:38:09 +08:00
415708937d 日计划-客户需求-对比 2026-01-19 17:13:50 +08:00
221679927d Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-19 10:57:13 +08:00
4b63caba3a 日计划管理-客户需求 2026-01-16 17:34:54 +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
1d2149a4f6 修改 2026-01-16 12:23:55 +08:00
db1e49ff51 币种转换 2026-01-16 11:13:57 +08:00
4af0260643 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2026-01-15 18:05:23 +08:00
36dcdac894 修改 2026-01-15 17:56:37 +08:00
249f037843 日计划管理-客户需求 2026-01-15 16:58:14 +08:00
377753c478 update 2026-01-13 17:04:56 +08:00
e39ef931b2 修改 2026-01-13 16:17:00 +08:00
1956179c08 修改 2026-01-12 17:31:21 +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
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
6361342e5a 查询联行号 2025-12-30 09:19:37 +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
28737e848b Merge remote-tracking branch 'origin/dev' into dev 2025-12-26 11:01:53 +08:00