Commits · f0ee7244b307985314beeb0fd9645bb42c736486 · 董敬伟 / liquidnet-bus-v1

14 Oct, 2021 29 commits
- Merge remote-tracking branch 'origin/new_member' into new_member · f0ee7244
  张国柄 authored Oct 14, 2021
  
  f0ee7244
- opt; · b6b9bd8a
  张国柄 authored Oct 14, 2021
  
  b6b9bd8a
- 查询数据库的方式 · 53e99fa9
  jiangxiulong authored Oct 14, 2021
```
getNew
退款完善 防止多次退库存
```
  53e99fa9
- Merge remote-tracking branch 'origin/new_member' into new_member · 4ebdca4c
  jiangxiulong authored Oct 14, 2021
  
  4ebdca4c
- 代金、满减，商品搜索字段赋值; · 3f27cd0f
  张国柄 authored Oct 14, 2021
  
  3f27cd0f
- revert:代金、满减，商品搜索字段赋值; · 20d2f143
  张国柄 authored Oct 14, 2021
  
  20d2f143
- 代金、满减，商品搜索字段赋值; · bb0ec38d
  张国柄 authored Oct 14, 2021
```
会员开售开关配置;
```
  bb0ec38d
- 修改创建成功之后的跳转 · 74da956c
  dongchun authored Oct 14, 2021
  
  74da956c
- Merge remote-tracking branch 'origin/new_member' into new_member · 090d12ce
  liuran authored Oct 14, 2021
  
  090d12ce
- 修改会员基础信息 · d47d6b76
  liuran authored Oct 14, 2021
  
  d47d6b76
- opt; · d04b264a
  张国柄 authored Oct 14, 2021
  
  d04b264a
- #749:ADMIN:优先劵列表顺序不是倒序; · fd8197c5
  张国柄 authored Oct 14, 2021
  
  fd8197c5
- log · 23ed7d24
  jiangxiulong authored Oct 14, 2021
  
  23ed7d24
- log · 924a78b3
  jiangxiulong authored Oct 14, 2021
  
  924a78b3
- fix:公有券使用时user_coupon.insert逻辑调整; · db4f09e3
  张国柄 authored Oct 14, 2021
  
  db4f09e3
- 只有超时退款不处理其他都处理库存和券 · 32cb02d7
  jiangxiulong authored Oct 14, 2021
```
错别字
```
  32cb02d7
- sql · 8e96f7ba
  jiangxiulong authored Oct 14, 2021
  
  8e96f7ba
- Merge remote-tracking branch 'origin/new_member' into new_member · d7fab81e
  jiangxiulong authored Oct 14, 2021
  
  d7fab81e
- kylin_order_express 增加字段 order_refunds_id 防止多次退款不好查物流 · a15e21e0
  jiangxiulong authored Oct 14, 2021
  
  a15e21e0
- fix:+mq.sql字段; · 0cc4487d
  张国柄 authored Oct 14, 2021
  
  0cc4487d
- 快递 · 2db6722a
  jiangxiulong authored Oct 14, 2021
  
  2db6722a
- Merge remote-tracking branch 'origin/new_member' into new_member · a16ff876
  jiangxiulong authored Oct 14, 2021
  
  a16ff876
- sql null · 34655d54
  jiangxiulong authored Oct 14, 2021
  
  34655d54
- fix:会员基础信息编辑:弹窗文案赋值属性调整; · b9a17188
  张国柄 authored Oct 14, 2021
  
  b9a17188
- sql null · d890259f
  jiangxiulong authored Oct 14, 2021
  
  d890259f
- log · 1464532e
  jiangxiulong authored Oct 14, 2021
  
  1464532e
- Merge remote-tracking branch 'origin/new_member' into new_member · 63b9cc6c
  jiangxiulong authored Oct 14, 2021
  
  63b9cc6c
- !CollectionUtils.isEmpty(header) · 07c982a8
  jiangxiulong authored Oct 14, 2021
  
  07c982a8
- Merge remote-tracking branch 'origin/master' into new_member · b94dd2a5
  张国柄 authored Oct 14, 2021
  
  b94dd2a5
13 Oct, 2021 11 commits
- log · 44245cf8
  jiangxiulong authored Oct 13, 2021
  
  44245cf8
- log · 0d919c64
  jiangxiulong authored Oct 13, 2021
  
  0d919c64
- log · 00cea9bd
  jiangxiulong authored Oct 13, 2021
  
  00cea9bd
- Merge branch 'pre' into 'master' · de623b90
  王斐 authored Oct 13, 2021
```
fix:order pre;

See merge request !74
```
  de623b90
- fix:order pre; · 088c5337
  张国柄 authored Oct 13, 2021
  
  088c5337
- useBackJxl · 7beffd24
  jiangxiulong authored Oct 13, 2021
  
  7beffd24
- useBackJxl · b1ec3820
  jiangxiulong authored Oct 13, 2021
  
  b1ec3820
- useBackJxl · 8bfd7fa5
  jiangxiulong authored Oct 13, 2021
  
  8bfd7fa5
- Merge remote-tracking branch 'origin/new_member' into new_member · d03be654
  jiangxiulong authored Oct 13, 2021
  
  d03be654
- 区分用户申请退款是普通还是快递 · 83bc793f
  jiangxiulong authored Oct 13, 2021
  
  83bc793f
- 11 · 7ebef4e8
  dongchun authored Oct 13, 2021
  
  7ebef4e8