Commits · 5280c063d4c4fdc58aa5f74d21ac203088995bbc · 董敬伟 / liquidnet-bus-v1

15 Nov, 2022 5 commits
- 提交 order 支持 appletb · 5280c063
  胡佳晨 authored Nov 15, 2022
  
  5280c063
- 提交 order 支持 appletb · 71599584
  胡佳晨 authored Nov 15, 2022
  
  71599584
- Merge branch 'jxl_modern' into dev-dragon0518 · b1f19ae7
  张国柄 authored Nov 15, 2022
  
  b1f19ae7
- Merge remote-tracking branch 'origin/master' into dev-dragon0518 · 58bcf2e2
  张国柄 authored Nov 15, 2022
  
  58bcf2e2
- Merge remote-tracking branch 'origin/master' into jxl_modern · b5ccb87a
  张国柄 authored Nov 15, 2022
  
  b5ccb87a
11 Nov, 2022 8 commits
- Merge branch 'pre' into 'master' · 5d3c49f8
  Administrator authored Nov 11, 2022
```
Pre

See merge request !325
```
  5d3c49f8
- ~opt; · e030c2f4
  张国柄 authored Nov 11, 2022
  
  e030c2f4
- ~opt; · b3f5d824
  张国柄 authored Nov 11, 2022
  
  b3f5d824
- ~admin:del.html:* copy; · 7337a6f1
  张国柄 authored Nov 11, 2022
  
  7337a6f1
- ~api:导入:+log+锁主动释放; · 3f22e715
  张国柄 authored Nov 11, 2022
  
  3f22e715
- ~opt; · bd07c790
  张国柄 authored Nov 11, 2022
  
  bd07c790
- ~sql; · 4941a312
  张国柄 authored Nov 11, 2022
  
  4941a312
- ~api:导入:模板/校验调整; · 9a399fde
  张国柄 authored Nov 11, 2022
  
  9a399fde
10 Nov, 2022 27 commits
- ~opt; · 21b819ad
  张国柄 authored Nov 10, 2022
  
  21b819ad
- ~opt; · 0962bd57
  张国柄 authored Nov 10, 2022
  
  0962bd57
- ~opt; · ac9a5f28
  张国柄 authored Nov 10, 2022
  
  ac9a5f28
- ~api:编辑SKU同步更新活动SKU条码; · 73aa5423
  张国柄 authored Nov 10, 2022
  
  73aa5423
- ~api:导入:模板/校验调整; · 89109bde
  张国柄 authored Nov 10, 2022
  
  89109bde
- 提交再次支付 · 8a550ad4
  胡佳晨 authored Nov 10, 2022
  
  8a550ad4
- 提交测试 · 0a98d5e4
  胡佳晨 authored Nov 10, 2022
  
  0a98d5e4
- 提交测试 · 6221ffb1
  胡佳晨 authored Nov 10, 2022
  
  6221ffb1
- Merge remote-tracking branch 'origin/dev_221101ZGB01' into dev_221101ZGB01 · 3b21b559
  胡佳晨 authored Nov 10, 2022
  
  3b21b559
- 提交测试 · ac846ef1
  胡佳晨 authored Nov 10, 2022
  
  ac846ef1
- ~api:添加/编辑 SPU/SKU 编码/条码逻辑调整; · 2edd21c6
  张国柄 authored Nov 10, 2022
  
  2edd21c6
- ~api:根据条码获得商品详情:参数逻辑调整; · 07002ca1
  张国柄 authored Nov 10, 2022
  
  07002ca1
- Merge remote-tracking branch 'origin/dev_221101ZGB01' into dev_221101ZGB01 · 32a40cd9
  张国柄 authored Nov 10, 2022
  
  32a40cd9
- 隐藏 musicList · e0c3a252
  胡佳晨 authored Nov 10, 2022
  
  e0c3a252
- Merge remote-tracking branch 'origin/dev_221107_zgb_goods_import' into dev_221101ZGB01 · 04771566
  张国柄 authored Nov 10, 2022
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_ln_goblin_initialdata.sql
```
  04771566
- Merge remote-tracking branch 'origin/master' into dev_221107_zgb_goods_import · 9f349e3f
  张国柄 authored Nov 10, 2022
  
  9f349e3f
- ~api:导入解析SKU条码逻辑调整; · 513f113d
  张国柄 authored Nov 10, 2022
  
  513f113d
- 取消 dragon的改动 · cddbb989
  胡佳晨 authored Nov 10, 2022
  
  cddbb989
- 取消 dragon的改动 · b8588fc8
  胡佳晨 authored Nov 10, 2022
  
  b8588fc8
- ~api:商品SPU|SKU+条码、ERP编码; · 7612a8ed
  张国柄 authored Nov 10, 2022
  
  7612a8ed
- 取消 dragon的改动 · a9d3a9d6
  胡佳晨 authored Nov 10, 2022
  
  a9d3a9d6
- alipay 扫码退款 · 0c2620ca
  胡佳晨 authored Nov 10, 2022
  
  0c2620ca
- alipay 扫码退款 · 3e37be3b
  胡佳晨 authored Nov 10, 2022
  
  3e37be3b
- 店铺折扣券向下取整。支付宝扫码退款 · 6a18b22e
  胡佳晨 authored Nov 10, 2022
  
  6a18b22e
- 店铺折扣券向下取整。支付宝扫码退款 · 03f33a35
  胡佳晨 authored Nov 10, 2022
  
  03f33a35
- 店铺折扣券向下取整。支付宝扫码退款 · a101b642
  胡佳晨 authored Nov 10, 2022
  
  a101b642
- ~api:店铺商品管理:批量导入数据:去除条码重复验证; · 6dde9b98
  张国柄 authored Nov 10, 2022
  
  6dde9b98