Commits · 0b08cf571b8d159799d65c830db035738b43bbf2 · 董敬伟 / liquidnet-bus-v1

02 Nov, 2021 1 commit

Merge branch 'master' into dev_stone · 0b08cf57

胡佳晨 authored Nov 02, 2021

# Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add1.html
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/candy/coupon/mgt/add2.html

0b08cf57

01 Nov, 2021 13 commits
- 提交下单接口 · d992ac66
  胡佳晨 authored Nov 01, 2021
  
  d992ac66
- 提交下单接口 · 94522aa3
  胡佳晨 authored Nov 01, 2021
  
  94522aa3
- 数据迁移 · d0e0b4db
  胡佳晨 authored Nov 01, 2021
  
  d0e0b4db
- Merge remote-tracking branch 'origin/dev_stone' into dev_stone · 4577b132
  胡佳晨 authored Nov 01, 2021
  
  4577b132
- 数据迁移 · 01b5f405
  胡佳晨 authored Nov 01, 2021
  
  01b5f405
- 编辑资料+积分; · ffc32717
  张国柄 authored Nov 01, 2021
  
  ffc32717
- Merge remote-tracking branch 'origin/dev_stone' into dev_stone · eafe89d2
  dongchun authored Nov 01, 2021
  
  eafe89d2
- 提交积分明细导出及发货接口对接 · faee4b58
  dongchun authored Nov 01, 2021
  
  faee4b58
- 修改配置 · c5de6f47
  胡佳晨 authored Nov 01, 2021
  
  c5de6f47
- 修改下单 · 09792cb1
  胡佳晨 authored Nov 01, 2021
  
  09792cb1
- 修改下单 · f22dadd1
  胡佳晨 authored Nov 01, 2021
  
  f22dadd1
- 修改下单 · e33d755f
  胡佳晨 authored Nov 01, 2021
  
  e33d755f
- 修改下单 · fb0003c5
  胡佳晨 authored Nov 01, 2021
  
  fb0003c5
29 Oct, 2021 15 commits
- where · 7b03be7a
  jiangxiulong authored Oct 29, 2021
  
  7b03be7a
- config · dc979af2
  jiangxiulong authored Oct 29, 2021
  
  dc979af2
- Merge branch 'pre' into 'master' · 3086b75c
  Administrator authored Oct 29, 2021
```
退款订单详情页面新增图片查看及下载功能

See merge request !113
```
  3086b75c
- Update application-k8s-test.yml · b6642ef5
  刘喆 authored Oct 29, 2021
  
  b6642ef5
- 退款订单详情页面新增图片查看及下载功能 · 998e56d8
  dongchun authored Oct 29, 2021
  
  998e56d8
- 退款订单详情页面新增图片查看及下载功能 · 12585c68
  dongchun authored Oct 29, 2021
  
  12585c68
- 改订单列表vo · 8cf56ca7
  胡佳晨 authored Oct 29, 2021
  
  8cf56ca7
- 增加图片字段 · f35a76da
  jiangxiulong authored Oct 29, 2021
  
  f35a76da
- draw 规范SweetQueue名字 · 4a8f7366
  jiangxiulong authored Oct 29, 2021
  
  4a8f7366
- Merge remote-tracking branch 'origin/dev_stone' into dev_stone · e7c6d860
  jiangxiulong authored Oct 29, 2021
  
  e7c6d860
- draw mysql · 8f336e96
  jiangxiulong authored Oct 29, 2021
  
  8f336e96
- 修改上传同一个图片会不触发方法的问题 · 5380df84
  dongchun authored Oct 29, 2021
  
  5380df84
- 改回去 · 26d92309
  胡佳晨 authored Oct 29, 2021
  
  26d92309
- perfectAddress · b55704c4
  jiangxiulong authored Oct 29, 2021
  
  b55704c4
- 奖品发货redis · 484019a2
  jiangxiulong authored Oct 29, 2021
  
  484019a2
28 Oct, 2021 11 commits
- 发货更新缓存 · f3b03ad0
  jiangxiulong authored Oct 28, 2021
  
  f3b03ad0
- 发货 · ffc36ba7
  jiangxiulong authored Oct 28, 2021
  
  ffc36ba7
- Merge remote-tracking branch 'origin/dev_stone' into dev_stone · e5a3594f
  jiangxiulong authored Oct 28, 2021
  
  e5a3594f
- page>1 mongo取 · a086c714
  jiangxiulong authored Oct 28, 2021
  
  a086c714
- Merge branch 'pre' into 'master' · bbca2b8f
  刘喆 authored Oct 28, 2021
```
Pre

See merge request !112
```
  bbca2b8f
- 转盘页面相关功能 · 4d0165ef
  dongchun authored Oct 28, 2021
  
  4d0165ef
- Merge remote-tracking branch 'origin/fix_adam_close' into pre · c063e1f0
  张国柄 authored Oct 28, 2021
  
  c063e1f0
- fix:用户注销会员订单清除RDS数据; · 1506c43a
  张国柄 authored Oct 28, 2021
  
  1506c43a
- Merge remote-tracking branch 'origin/fix_admin_ccode_recover' into pre · f0f7e2bb
  张国柄 authored Oct 28, 2021
  
  f0f7e2bb
- fix:admin:券码退回交互; · fec4c882
  张国柄 authored Oct 28, 2021
  
  fec4c882
- null · 3b2588c2
  jiangxiulong authored Oct 28, 2021
  
  3b2588c2