Commits · 2e509a57f5719735cad5eb6b293fa633ee7b69c9 · 董敬伟 / liquidnet-bus-v1

07 Dec, 2021 16 commits
- admin抽奖列表 · 2e509a57
  jiangxiulong authored Dec 07, 2021
  
  2e509a57
- Merge remote-tracking branch 'origin/jxl_1201_jifenDraw' into jxl_1201_jifenDraw · aa9a3ca4
  jiangxiulong authored Dec 07, 2021
  
  aa9a3ca4
- 抽奖列表 · 24ea35ae
  jiangxiulong authored Dec 07, 2021
  
  24ea35ae
- ~创建券-领取方式[2-积分商品｜4-会员专属]不生成券有效期，实际发放时计算; · 44b46d26
  张国柄 authored Dec 07, 2021
  
  44b46d26
- ~创建券同步券基础信息至RDS（替换原发放券同步券基础信息至RDS）; · 81a1765f
  张国柄 authored Dec 07, 2021
  
  81a1765f
- 券列表 · 9a7a2291
  jiangxiulong authored Dec 07, 2021
  
  9a7a2291
- getSwitch 删除 · 66e76d19
  jiangxiulong authored Dec 07, 2021
  
  66e76d19
- 中奖返回值、EstimatedNum · 60acb331
  jiangxiulong authored Dec 07, 2021
  
  60acb331
- 抽奖完善优化 · 855d6704
  jiangxiulong authored Dec 07, 2021
  
  855d6704
- feign adam · a6f38fa4
  jiangxiulong authored Dec 07, 2021
  
  a6f38fa4
- token · 7964866d
  jiangxiulong authored Dec 07, 2021
  
  7964866d
- 创建积分活动+优惠券选择 · d8ee8257
  qinshuangshuang@zhengzai.tv authored Dec 07, 2021
  
  d8ee8257
- check/depth · 549eeeb8
  jiangxiulong authored Dec 07, 2021
  
  549eeeb8
- 是否会员概率*2 抽奖实物减总库存 · 4f4595a6
  jiangxiulong authored Dec 07, 2021
  
  4f4595a6
- 积分抽奖 · 4649bae8
  jiangxiulong authored Dec 07, 2021
  
  4649bae8
- 创建积分活动+优惠券选择 · e1395b99
  qinshuangshuang@zhengzai.tv authored Dec 07, 2021
  
  e1395b99
06 Dec, 2021 19 commits
- couponList · 46064c50
  jiangxiulong authored Dec 06, 2021
  
  46064c50
- 领券 · f7ecd0d8
  jiangxiulong authored Dec 06, 2021
  
  f7ecd0d8
- 35 5条随机 · 7d0ea47e
  jiangxiulong authored Dec 06, 2021
  
  7d0ea47e
- 抽奖 · b774de14
  jiangxiulong authored Dec 06, 2021
  
  b774de14
- candy 获取券详情 · 0906b684
  jiangxiulong authored Dec 06, 2021
  
  0906b684
- +feign.candy; · 85bfc750
  张国柄 authored Dec 06, 2021
  
  85bfc750
- Merge remote-tracking branch 'origin/jxl_1201_jifenDraw' into jxl_1201_jifenDraw · c7ccb199
  张国柄 authored Dec 06, 2021
  
  c7ccb199
- +feign.candy; · d3b428fb
  张国柄 authored Dec 06, 2021
  
  d3b428fb
- choujiang · 18187100
  jiangxiulong authored Dec 06, 2021
  
  18187100
- Merge remote-tracking branch 'origin/pre' into jxl_1201_jifenDraw · 03672984
  jiangxiulong authored Dec 06, 2021
```
# Conflicts:
#	liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/include.html
#	liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/SweetMybatisPlusCodeGenerator.java
```
  03672984
- strawberryMusic · 27d295be
  jiangxiulong authored Dec 06, 2021
  
  27d295be
- strawberryMusic · d7737a58
  jiangxiulong authored Dec 06, 2021
  
  d7737a58
- 抽奖完善 · e53cffa6
  jiangxiulong authored Dec 06, 2021
  
  e53cffa6
- 隐藏不必要和关键字段 · f93414ec
  jiangxiulong authored Dec 06, 2021
  
  f93414ec
- 奖品积分和实物分开存 · 85547b95
  jiangxiulong authored Dec 06, 2021
  
  85547b95
- 隐藏不必要和关键字段 · f2906dff
  jiangxiulong authored Dec 06, 2021
  
  f2906dff
- 创建积分活动+优惠券选择 · 31f1197d
  qinshuangshuang@zhengzai.tv authored Dec 06, 2021
  
  31f1197d
- Merge remote-tracking branch 'origin/jxl_1201_jifenDraw' into jxl_1201_jifenDraw · 40c5beec
  qinshuangshuang@zhengzai.tv authored Dec 06, 2021
  
  40c5beec
- 抽奖 vo · e3ec157d
  jiangxiulong authored Dec 06, 2021
  
  e3ec157d
03 Dec, 2021 5 commits
- 创建积分活动 · 4a7f943a
  qinshuangshuang@zhengzai.tv authored Dec 03, 2021
  
  4a7f943a
- 放开 pvuv · daacf7b5
  胡佳晨 authored Dec 03, 2021
  
  daacf7b5
- Merge branch 'dev_20211205' into pre · 115952b8
  jiangxiulong authored Dec 03, 2021
  
  115952b8
- Merge remote-tracking branch 'origin/dev_20211205' into dev_20211205 · ada62251
  jiangxiulong authored Dec 03, 2021
  
  ada62251
- 删除关注临时 · 5e56c9fd
  jiangxiulong authored Dec 03, 2021
  
  5e56c9fd