qianshijiang
|
b4905ba143
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-20 15:26:57 +08:00 |
|
guojunyun
|
584998b129
|
SZHGYL-289修改
|
2025-11-20 15:23:37 +08:00 |
|
潘荣晟
|
5a4d79449e
|
权限标识
|
2025-11-20 09:44:43 +08:00 |
|
潘荣晟
|
216ecf75c5
|
权限标识
|
2025-11-20 09:40:06 +08:00 |
|
qianshijiang
|
b337a9412c
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-19 17:58:18 +08:00 |
|
guojunyun
|
cff5a9d31d
|
supplierNumber赋值修改
|
2025-11-19 17:56:59 +08:00 |
|
guojunyun
|
feb7b490c9
|
SZHGYL-289修改
|
2025-11-19 17:26:09 +08:00 |
|
guojunyun
|
d325ceb06a
|
erp提交默认返回成功修改
|
2025-11-19 16:30:20 +08:00 |
|
qianshijiang
|
7e282e80e4
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-19 16:22:06 +08:00 |
|
潘荣晟
|
7ca81a74b5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-19 16:21:00 +08:00 |
|
潘荣晟
|
58612efd77
|
销售订单明细修复订单单位不显示的问题
|
2025-11-19 16:20:17 +08:00 |
|
chenbowen
|
adcafa3784
|
Merge branch 'dev' into test
|
2025-11-19 15:44:24 +08:00 |
|
guojunyun
|
05069e2846
|
SZHGYL-289修改
|
2025-11-19 15:15:37 +08:00 |
|
付鹏飞
|
c39ffa54ee
|
Merge branch 'dev' into 'test'
销售订单明细修复订单不显示的问题
See merge request jygk/dsc-base!22
|
2025-11-19 03:35:46 +00:00 |
|
潘荣晟
|
d5572c200b
|
销售订单明细修复订单不显示的问题
|
2025-11-19 11:32:52 +08:00 |
|
qianshijiang
|
fb3dfaec48
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-19 11:10:09 +08:00 |
|
潘荣晟
|
dc37a2f587
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-19 11:05:43 +08:00 |
|
潘荣晟
|
b7cfe7485e
|
【销售订单-订单检索】查询条件字段需要支持模糊查询修复
|
2025-11-19 11:02:03 +08:00 |
|
qianshijiang
|
ed94355886
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-18 17:41:04 +08:00 |
|
guojunyun
|
685ba9473b
|
查询结算公式列表：增加明细列表数据返回
|
2025-11-18 14:44:31 +08:00 |
|
guojunyun
|
09f8db69c4
|
SZHGYL-251修改
|
2025-11-18 10:19:16 +08:00 |
|
周迪
|
3230fb9a44
|
Merge branch 'dev' into 'test'
新增根据合同编号获得交易信息接口
See merge request jygk/dsc-base!20
|
2025-11-14 14:06:38 +00:00 |
|
guojunyun
|
82219fd733
|
新增根据合同编号获得交易信息接口
|
2025-11-14 17:15:58 +08:00 |
|
hxt
|
b5c7c9b479
|
Merge branch 'dev' into test
|
2025-11-14 17:11:39 +08:00 |
|
hxt
|
f797283021
|
订单单位
|
2025-11-14 17:10:39 +08:00 |
|
qianshijiang
|
0d98763496
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-14 14:54:23 +08:00 |
|
guojunyun
|
a6922e57da
|
字符串转换
|
2025-11-14 14:43:15 +08:00 |
|
wencai he
|
c6b01740ea
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc-base!19
|
2025-11-14 01:49:37 +00:00 |
|
guojunyun
|
d4998009a1
|
合同明细新增字段
|
2025-11-14 09:38:25 +08:00 |
|
qianshijiang
|
333cc203c3
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-13 17:53:25 +08:00 |
|
潘荣晟
|
057336c65a
|
模版修改
|
2025-11-13 17:46:47 +08:00 |
|
qianshijiang
|
1410eea250
|
Merge remote-tracking branch 'origin/dev' into test
|
2025-11-13 09:17:08 +08:00 |
|
潘荣晟
|
bd306b7e45
|
模版修改
|
2025-11-12 17:00:21 +08:00 |
|
chenbowen
|
f5c580cee6
|
Merge branch 'dev' into test
|
2025-11-12 15:23:33 +08:00 |
|
guojunyun
|
33bea2cad0
|
更新合同接口：获取动态字段、表单报错修改
|
2025-11-12 11:08:12 +08:00 |
|
guojunyun
|
2ee461bef2
|
国贸推送合同接口：接口请求号参数名修改
|
2025-11-12 09:28:58 +08:00 |
|
guojunyun
|
1747b96d2b
|
国贸推送合同接口：接口请求号参数名修改
|
2025-11-12 09:28:20 +08:00 |
|
孙承赐
|
e5e583d2c7
|
Merge branch 'dev' into 'test'
国贸2.0系统推送合同回调：消息固定R_JG_MY_00应答，_interfaceType__固定传R_MY_JG_10
See merge request jygk/dsc-base!18
|
2025-11-11 10:31:06 +00:00 |
|
guojunyun
|
1f949f7013
|
合同动态字段及条款修改
|
2025-11-11 17:26:31 +08:00 |
|
潘荣晟
|
b0f4dbfb52
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-11 17:10:15 +08:00 |
|
潘荣晟
|
5b55175310
|
模版修改
|
2025-11-11 17:10:00 +08:00 |
|
guojunyun
|
edfd72ea68
|
国贸推送合同对接修改
|
2025-11-11 15:53:17 +08:00 |
|
潘荣晟
|
717db0f3ce
|
Merge remote-tracking branch 'origin/dev' into dev
|
2025-11-11 14:05:14 +08:00 |
|
潘荣晟
|
ddfc7d8965
|
模版修改
|
2025-11-11 11:52:35 +08:00 |
|
guojunyun
|
83c1f318e1
|
合同主信息do修改
|
2025-11-11 09:41:41 +08:00 |
|
guojunyun
|
10dd7966fa
|
合同主信息添加确实包导入
|
2025-11-11 09:37:29 +08:00 |
|
guojunyun
|
e6aa0042d9
|
国贸2.0系统推送合同回调：消息固定R_JG_MY_00应答，_interfaceType__固定传R_MY_JG_10
合同主信息添加货权转移类型(字典：ASY_MTNG_TP)字段
|
2025-11-11 09:35:41 +08:00 |
|
wencai he
|
08f6177007
|
Merge branch 'dev' into 'test'
docs: 完善单位转换系统使用文档，添加Feign跨模块调用示例
See merge request jygk/dsc-base!17
|
2025-11-11 01:30:56 +00:00 |
|
guojunyun
|
c2fdfee149
|
国贸2.0系统推送合同：回调返回参数修改
|
2025-11-10 16:56:31 +08:00 |
|
wencai he
|
1395e89633
|
Merge branch 'dev' into 'test'
Dev
See merge request jygk/dsc-base!16
|
2025-11-10 08:08:28 +00:00 |
|