Commits · 7f2a0922e69b45b36e69d5ea72432e067b5d2148 · 董敬伟 / liquidnet-bus-v1

06 Dec, 2022 1 commit
- 提交 erp 同步库存接口 · 7f2a0922
  胡佳晨 authored Dec 06, 2022
  
  7f2a0922
05 Dec, 2022 9 commits
- ~api:商品管理:商品/规格实体类ERP属性处理; · 22cec264
  张国柄 authored Dec 05, 2022
  
  22cec264
- ~api:商品管理:单品添加/编辑+ERP属性处理; · ec2aab47
  张国柄 authored Dec 05, 2022
  
  ec2aab47
- 提交下单 order相关erp字段添加 · f37cb49c
  胡佳晨 authored Dec 05, 2022
  
  f37cb49c
- ~api:商品管理:商品添加/编辑+ERP属性处理; · f688fe76
  张国柄 authored Dec 05, 2022
  
  f688fe76
- 订单提交测试完成 · 8ba04b50
  胡佳晨 authored Dec 05, 2022
  
  8ba04b50
- 暂时提交 · 69a2e9d3
  胡佳晨 authored Dec 05, 2022
  
  69a2e9d3
- Merge remote-tracking branch 'origin/dev_erp' into dev_erp · 5224721a
  张国柄 authored Dec 05, 2022
  
  5224721a
- ~config:商品管理+ERP管理属性; · fe00e01d
  张国柄 authored Dec 05, 2022
  
  fe00e01d
- 暂时提交注释代码还需要 · b48a8b3d
  胡佳晨 authored Dec 05, 2022
  
  b48a8b3d
02 Dec, 2022 4 commits
- erp 相关测试接口提交 · fc79173c
  胡佳晨 authored Dec 02, 2022
  
  fc79173c
- Merge remote-tracking branch 'origin/dev_erp' into dev_erp · 9b8a31af
  胡佳晨 authored Dec 02, 2022
  
  9b8a31af
- erp 相关测试接口提交 · 960f032e
  胡佳晨 authored Dec 02, 2022
  
  960f032e
- Merge branch 'master' into dev_erp · 055950d7
  胡佳晨 authored Dec 02, 2022
  
  055950d7
30 Nov, 2022 9 commits
- Merge remote-tracking branch 'origin/master' into dev_erp · eeb7a803
  zhanggb authored Nov 30, 2022
  
  eeb7a803
- Merge branch 'pre' into 'master' · a28fe678
  Administrator authored Nov 30, 2022
```
Pre

See merge request !331
```
  a28fe678
- Merge branch 'dev221130zgb_export_zzMarketOrder' into 'pre' · bc4e6178
  Administrator authored Nov 30, 2022
```
Dev221130zgb export zz market order

See merge request !330
```
  bc4e6178
- ~api:正在下单:活动订单数据导出-周焕:文件名称调整; · 77fbd333
  zhanggb authored Nov 30, 2022
  
  77fbd333
- 添加erp vo · 073e1c8a
  胡佳晨 authored Nov 30, 2022
  
  073e1c8a
- ~api:正在下单:活动订单数据导出-周焕:活动ID+ZZ前缀; · 2709f11b
  zhanggb authored Nov 30, 2022
  
  2709f11b
- ~api:正在下单:活动订单数据导出LOG-周焕; · cc50c382
  zhanggb authored Nov 30, 2022
  
  cc50c382
- ~api:正在下单:活动订单数据导出-周焕; · 4c3030d9
  zhanggb authored Nov 30, 2022
  
  4c3030d9
- +api:正在下单:活动订单数据导出-周焕; · 67484de3
  zhanggb authored Nov 30, 2022
  
  67484de3
28 Nov, 2022 8 commits
- Merge branch 'pre' into 'master' · 92699679
  Administrator authored Nov 28, 2022
```
Pre

See merge request !329
```
  92699679
- Merge branch 'editTicket_1128_master' into pre · 4792f39e
  Your Name authored Nov 28, 2022
  
  4792f39e
- 修改满减券参数 · 215b9114
  Your Name authored Nov 28, 2022
  
  215b9114
- 修改代金券全部商品 · ce94d969
  Your Name authored Nov 28, 2022
  
  ce94d969
- 添加总代名称 · 559e4fc0
  胡佳晨 authored Nov 28, 2022
  
  559e4fc0
- 修改校园代理手机号证件号 · f5b37da8
  胡佳晨 authored Nov 28, 2022
  
  f5b37da8
- 修改校园代理手机号证件号 · bd01c485
  胡佳晨 authored Nov 28, 2022
  
  bd01c485
- Merge branch 'master' into hjc_smile_1115 · dcc35187
  胡佳晨 authored Nov 28, 2022
  
  dcc35187
25 Nov, 2022 4 commits
- Merge branch 'pre' into 'master' · abb53648
  Administrator authored Nov 25, 2022
```
Pre

See merge request !328
```
  abb53648
- 修改 goblin · 700e01d5
  胡佳晨 authored Nov 25, 2022
  
  700e01d5
- 修改 goblin · 60910d0a
  胡佳晨 authored Nov 25, 2022
  
  60910d0a
- 修改 goblin · 764239dc
  胡佳晨 authored Nov 25, 2022
  
  764239dc
24 Nov, 2022 1 commit
- pos机出货核销详情接口 · c81c09a0
  胡佳晨 authored Nov 24, 2022
  
  c81c09a0
23 Nov, 2022 2 commits
- 修改商品再次支付 · aba34028
  胡佳晨 authored Nov 23, 2022
  
  aba34028
- erp 提交接口 · 12339347
  胡佳晨 authored Nov 23, 2022
  
  12339347
22 Nov, 2022 2 commits
- 修改 pos · 810e7558
  胡佳晨 authored Nov 22, 2022
  
  810e7558
- 修改 pos · ad39e3ed
  胡佳晨 authored Nov 22, 2022
  
  ad39e3ed