Commit Graph

131 Commits

Author SHA1 Message Date
176567e4b2 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-11-19 10:08:53 +08:00
461d5c78b4 新增卸货地 2025-11-19 10:06:20 +08:00
7bb592eb8c 销售管理-客户 2025-11-18 17:33:01 +08:00
5e68c82fcc 更新根据id获取下级地区接口 2025-11-17 16:35:31 +08:00
a4132616ba ---添加jar管理测试模块 2025-11-13 19:26:32 +08:00
3f27f8ee04 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev
# Conflicts:
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/CountryRegionController.java
2025-11-11 15:47:20 +08:00
505327b6f5 --优化国家地区缓存机制 2025-11-11 15:00:06 +08:00
aea4737a54 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-11-07 14:10:44 +08:00
7d706338c0 增加所属国家和地区显示 2025-11-07 14:09:30 +08:00
5d7f860e8d 代码优化 2025-11-07 11:45:14 +08:00
faaf465554 增加所属国家和地区显示 2025-11-06 18:54:43 +08:00
90d91cb763 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev
# Conflicts:
#	itc-pcitc-dependencies/itc-pcitc-dependencies-service/src/main/java/com/xjrsoft/module/common/db/utils/CommonCallUtils.java
2025-11-06 17:20:29 +08:00
12583611d9 --修改函数失败没有回滚问题 2025-11-06 17:16:47 +08:00
958620a6df Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-11-06 17:07:30 +08:00
200035414d 代码优化 2025-11-06 17:04:11 +08:00
900422b2be Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-11-06 17:03:16 +08:00
11852beb31 Merge remote-tracking branch 'origin/dev' into dev 2025-11-06 17:02:11 +08:00
e7367055df 修改个人本地使用配置文件 2025-11-06 16:56:59 +08:00
57df202f6d Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-11-05 17:47:08 +08:00
299bdc0275 ----添加,jar管理功能 2025-11-05 17:47:00 +08:00
8d0e068231 增加国家地区缓存 2025-11-05 16:40:24 +08:00
d191bbeaaf 增加国家地区缓存 2025-11-05 16:07:11 +08:00
c3c02b7a6a Merge remote-tracking branch 'origin/dev' into dev 2025-11-05 12:21:34 +08:00
b639a5f284 增加国家地区缓存 2025-11-05 12:20:47 +08:00
f7664f0de7 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-11-04 18:19:55 +08:00
d54cee4d44 ---测试远程jar包管理功能 2025-11-04 18:19:42 +08:00
382cd30c79 Merge remote-tracking branch 'origin/dev' into dev 2025-11-04 18:13:20 +08:00
17ebe4463c 修改费用名称 2025-11-04 18:11:07 +08:00
fbf15b6440 增加个人本地使用配置文件 2025-11-04 09:34:55 +08:00
82fbaa4f25 --添加操作生命周期接口 2025-11-03 14:22:28 +08:00
ebde33b225 ---修改启用和作废调用方式 2025-11-03 14:09:24 +08:00
6e718eeb31 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-10-30 20:44:21 +08:00
ce6bc91e91 ---数据服务操作增加操作对象生命周期 2025-10-30 20:44:15 +08:00
2ff6926956 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-10-30 15:36:17 +08:00
03939d7a64 修改 2025-10-30 15:30:48 +08:00
39c21d9605 Merge remote-tracking branch 'origin/dev' into dev 2025-10-29 11:08:04 +08:00
17e5dd1a2e 修复禁用功能bug 2025-10-29 11:06:19 +08:00
e5e4cba0fc Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev 2025-10-29 09:04:51 +08:00
e2f5e6e37d ---修改数据日志修改记录逻辑 2025-10-29 09:04:46 +08:00
80110a4d46 增加事务注解 2025-10-28 18:25:00 +08:00
f8aad0fd81 修改银行搜索 2025-10-28 17:04:10 +08:00
0821471679 修改排序 2025-10-28 15:51:37 +08:00
f1e70966b7 管道气管线名称 2025-10-27 17:50:36 +08:00
57420c88c1 修改排序 2025-10-27 15:43:20 +08:00
2cc0fe1517 管道气查看日志 2025-10-27 15:23:00 +08:00
374a1f1c81 修改根据id获取下级地区节点 2025-10-27 10:34:19 +08:00
51f192d7f8 Merge remote-tracking branch 'origin/dev' into dev 2025-10-27 10:33:00 +08:00
89a3781fab 公司资质证书、品种新增 2025-10-27 10:09:07 +08:00
4f25031859 修改税率和费用名称 2025-10-24 17:32:25 +08:00
a5c052e614 Merge branch 'dev' of http://47.94.165.164:13000/geg-gas/geg-gas-pcitc into dev
# Conflicts:
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/LNGStationController.java
#	itc-pcitc-mdm/itc-pcitc-mdm-service/src/main/java/com/xjrsoft/module/mdm/controller/PortController.java
2025-10-24 16:30:09 +08:00