Commits · 11c879abd7ca32f1fedc641fb11e664be6131e5e · 董敬伟 / liquidnet-bus-v1

10 Jan, 2023 3 commits
- 修改 config-test erp的url由测试改为正式 · 11c879ab
  胡佳晨 authored Jan 10, 2023
  
  11c879ab
- 修改 · 90d615f3
  胡佳晨 authored Jan 10, 2023
  
  90d615f3
- Merge branch 'master' into dev_erp_gjy · bb286155
  胡佳晨 authored Jan 10, 2023
  
  bb286155
09 Jan, 2023 4 commits
- Merge branch 'pre' into 'master' · c8d44515
  Administrator authored Jan 09, 2023
```
代理 state 代理

See merge request !333
```
  c8d44515
- 代理 state 代理 · ce152c50
  胡佳晨 authored Jan 09, 2023
  
  ce152c50
- erp 正在下单推送订单修改 · f8d953ac
  胡佳晨 authored Jan 09, 2023
  
  f8d953ac
- 提交 · f7590b36
  胡佳晨 authored Jan 09, 2023
  
  f7590b36
07 Jan, 2023 13 commits
- Merge remote-tracking branch 'origin/dev_erp_gjy' into dev_erp_gjy · 4c205517
  zhanggb authored Jan 07, 2023
  
  4c205517
- ~revert:xuper upload image:临时文件名称处理; · 11984444
  zhanggb authored Jan 07, 2023
  
  11984444
- Merge remote-tracking branch 'origin/dev_erp_gjy' into dev_erp_gjy · d8085b52
  胡佳晨 authored Jan 07, 2023
  
  d8085b52
- 需改 erphosting 不是1不处理 · 93125131
  胡佳晨 authored Jan 07, 2023
  
  93125131
- Merge remote-tracking branch 'origin/dev_erp_gjy' into dev_erp_gjy · ddf6a58b
  zhanggb authored Jan 07, 2023
  
  ddf6a58b
- ~bug:xuper upload image:临时文件名称处理; · d593f722
  zhanggb authored Jan 07, 2023
  
  d593f722
- 需改 erphosting 不是1不处理 · 9d0f56e4
  胡佳晨 authored Jan 07, 2023
  
  9d0f56e4
- 修改erp文案 · c2dcf08e
  胡佳晨 authored Jan 07, 2023
  
  c2dcf08e
- 第三方平台离线券券名称修改 · 16ac1d2f
  胡佳晨 authored Jan 07, 2023
  
  16ac1d2f
- 第三方平台离线券券名称修改 · baf24014
  胡佳晨 authored Jan 07, 2023
  
  baf24014
- 修改离线券算法 · fbd789de
  胡佳晨 authored Jan 07, 2023
  
  fbd789de
- Merge remote-tracking branch 'origin/dev_erp_gjy' into dev_erp_gjy · 40634911
  胡佳晨 authored Jan 07, 2023
  
  40634911
- 修改离线券算法 · 22744844
  胡佳晨 authored Jan 07, 2023
  
  22744844
06 Jan, 2023 13 commits
- ~api:店铺管理:店铺ERP配置Mongo查取条件; · c5bfd7a6
  zhanggb authored Jan 06, 2023
  
  c5bfd7a6
- 修改支出多店铺 erp · 05ab1f62
  胡佳晨 authored Jan 06, 2023
  
  05ab1f62
- Merge remote-tracking branch 'origin/dev_erp_gjy' into dev_erp_gjy · e71ff282
  胡佳晨 authored Jan 06, 2023
  
  e71ff282
- 修改支出多店铺 erp · 2f4b79c8
  胡佳晨 authored Jan 06, 2023
  
  2f4b79c8
- +valid:店铺管理:店铺ERP配置编辑+; · 77dbf88d
  zhanggb authored Jan 06, 2023
  
  77dbf88d
- ~api:店铺管理:店铺ERP配置编辑; · 730ff243
  zhanggb authored Jan 06, 2023
  
  730ff243
- ~api:店铺管理:店铺ERP配置编辑; · d97db308
  zhanggb authored Jan 06, 2023
  
  d97db308
- ~api:店铺管理:店铺ERP配置编辑; · 525b5fe2
  zhanggb authored Jan 06, 2023
  
  525b5fe2
- ~api:店铺管理:店铺ERP配置编辑入库; · fc1cbbd3
  zhanggb authored Jan 06, 2023
  
  fc1cbbd3
- ~api:店铺管理:店铺ERP.shopNoList获取; · 435523a3
  zhanggb authored Jan 06, 2023
  
  435523a3
- Merge remote-tracking branch 'origin/dev_erp' into dev_erp_gjy · b6e66ee8
  zhanggb authored Jan 06, 2023
  
  b6e66ee8
- +api:店铺管理:店铺ERP配置; · 7201c4b3
  zhanggb authored Jan 06, 2023
  
  7201c4b3
- 修改erp推送 sku原价改为支付价格 · 3e93d2bc
  胡佳晨 authored Jan 06, 2023
  
  3e93d2bc
05 Jan, 2023 5 commits
- 修改erp推送 sku原价改为支付价格 · 9d63b8d3
  胡佳晨 authored Jan 05, 2023
  
  9d63b8d3
- 修改组合购，sku价格由原价改为支付价格 · eea5e654
  胡佳晨 authored Jan 05, 2023
  
  eea5e654
- 修改 pos机扫码申请退款后支付宝人工通过接口 · b8f2a50a
  胡佳晨 authored Jan 05, 2023
  
  b8f2a50a
- erp 组合售下单 · d57a4107
  胡佳晨 authored Jan 05, 2023
  
  d57a4107
- ~revert:商城-订单信息导出:正在下单-销售数据; · ace202f4
  zhanggb authored Jan 05, 2023
  
  ace202f4
04 Jan, 2023 2 commits
- Merge branch 'dev_erp' into dev_erp_gjy · 8632027e
  胡佳晨 authored Jan 04, 2023
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/erp/WdtServiceImpl.java
```
  8632027e
- erp 修改同步库存和推送订单 · 9b533f4c
  胡佳晨 authored Jan 04, 2023
  
  9b533f4c