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

11 Aug, 2021 2 commits
- 会员下单添加收货地址处理; · f3e0e5a8
  张国柄 authored Aug 11, 2021
```
 - 针对会员改版上线前，用户购买会员礼包发放;
```
  f3e0e5a8
- Merge remote-tracking branch 'origin/master' into dev_passwd_login · 2113d8a0
  张国柄 authored Aug 11, 2021
```
# Conflicts:
#	liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties
```
  2113d8a0
10 Aug, 2021 19 commits
- Merge branch 'test' into 'master' · 91a97871
  Administrator authored Aug 10, 2021
```
refund

See merge request !9
```
  91a97871
- refund · 579684c2
  jiangxiulong authored Aug 10, 2021
  
  579684c2
- Merge branch 'test' into 'master' · d3c7b41d
  Administrator authored Aug 10, 2021
```
Test

See merge request !8
```
  d3c7b41d
- fix 增加 timeSell · db23a2c8
  胡佳晨 authored Aug 10, 2021
  
  db23a2c8
- Merge remote-tracking branch 'origin/dev-sweet' into dev-sweet · 1f665fee
  jiangxiulong authored Aug 10, 2021
  
  1f665fee
- sweet log · 43c6ac0b
  jiangxiulong authored Aug 10, 2021
  
  43c6ac0b
- Merge remote-tracking branch 'origin/dev-sweet' into dev-sweet · d4ffef40
  胡佳晨 authored Aug 10, 2021
  
  d4ffef40
- fix 增加 timeSell · 52b2c450
  胡佳晨 authored Aug 10, 2021
  
  52b2c450
- sweet log · 2d81d0f8
  jiangxiulong authored Aug 10, 2021
  
  2d81d0f8
- sweet time · daf54bea
  jiangxiulong authored Aug 10, 2021
  
  daf54bea
- sweet time · 513c48fd
  jiangxiulong authored Aug 10, 2021
  
  513c48fd
- sweet log · 3a7da2d1
  jiangxiulong authored Aug 10, 2021
  
  3a7da2d1
- fix:小程序演出提醒模板消息发送异常处理; · bfeb9d1a
  张国柄 authored Aug 10, 2021
  
  bfeb9d1a
- Merge branch 'master' into dev-sweet · 8916d7eb
  胡佳晨 authored Aug 10, 2021
  
  8916d7eb
- fix 增加 timeSell · fd736958
  胡佳晨 authored Aug 10, 2021
  
  fd736958
- Merge branch 'fixbug_20210810' into 'master' · 6db63fa4
  Administrator authored Aug 10, 2021
```
fix;

See merge request !7
```
  6db63fa4
- fix; · 26810a73
  胡佳晨 authored Aug 10, 2021
  
  26810a73
- Merge branch 'test' into 'master' · 725e58cd
  Administrator authored Aug 10, 2021
```
kylin 周焕/王斐 看订单相关所有

See merge request !6
```
  725e58cd
- kylin 周焕/王斐看订单相关所有 · 444c5826
  胡佳晨 authored Aug 10, 2021
  
  444c5826
09 Aug, 2021 19 commits
- Merge branch 'test' into 'master' · 718b8c87
  Administrator authored Aug 09, 2021
```
Test

See merge request !5
```
  718b8c87
- admin修改操作日志sql数据类型长度 · fbb0707e
  anjiabin authored Aug 09, 2021
  
  fbb0707e
- admin修改操作日志sql数据类型长度 · 9669f0ed
  anjiabin authored Aug 09, 2021
  
  9669f0ed
- admin修改操作日志sql数据类型长度 · d24247cd
  anjiabin authored Aug 09, 2021
  
  d24247cd
- admin增加菜单操作日志 · e76bf71e
  anjiabin authored Aug 09, 2021
  
  e76bf71e
- admin增加操作菜单 · 343c5a49
  anjiabin authored Aug 09, 2021
  
  343c5a49
- admin增加菜单操作日志 · 89a23b8f
  anjiabin authored Aug 09, 2021
  
  89a23b8f
- admin增加操作菜单 · 62b767a4
  anjiabin authored Aug 09, 2021
  
  62b767a4
- admin增加菜单操作日志 · cb519057
  anjiabin authored Aug 09, 2021
  
  cb519057
- Merge branch 'dev-sweet' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev-sweet · daee1719
  anjiabin authored Aug 09, 2021
  
  daee1719
- admin增加操作菜单 · 0459e6d8
  anjiabin authored Aug 09, 2021
  
  0459e6d8
- fix:errmsg; · 9b6ebfd9
  张国柄 authored Aug 09, 2021
  
  9b6ebfd9
- Merge branch 'master' into dev-sweet · 14f8945e
  胡佳晨 authored Aug 09, 2021
  
  14f8945e
- sweet · 52317d1f
  胡佳晨 authored Aug 09, 2021
  
  52317d1f
- sweet · f3394920
  胡佳晨 authored Aug 09, 2021
  
  f3394920
- sweet · 3b7fc18f
  胡佳晨 authored Aug 09, 2021
  
  3b7fc18f
- sweet · c1f213b2
  胡佳晨 authored Aug 09, 2021
  
  c1f213b2
- sweet · 7b5c06a9
  胡佳晨 authored Aug 09, 2021
  
  7b5c06a9
- +密码登录:只针对PHP老用户; · 97a3a640
  张国柄 authored Aug 09, 2021
  
  97a3a640