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

17 Nov, 2021 13 commits
- 活动列表计算 · f4dd54b6
  jiangxiulong authored Nov 17, 2021
  
  f4dd54b6
- 修改缺陷 · 320b6ba7
  dongchun authored Nov 17, 2021
  
  320b6ba7
- redis key · a5e97456
  jiangxiulong authored Nov 17, 2021
  
  a5e97456
- drawList pageSize 10 · 84401769
  jiangxiulong authored Nov 17, 2021
  
  84401769
- 积分admin update · bf0e901e
  jiangxiulong authored Nov 17, 2021
  
  bf0e901e
- 积分admin · cb2585cc
  jiangxiulong authored Nov 17, 2021
  
  cb2585cc
- 同步未关注的没办法获取到unid 关注的无所谓保险换成openid · 339a72c1
  jiangxiulong authored Nov 17, 2021
  
  339a72c1
- 取消关注的时候获取不到unid 多存一份openid以便使用 · 607b80b7
  jiangxiulong authored Nov 17, 2021
  
  607b80b7
- Math.ceil 0.6=0 默认+1 · cdf81784
  jiangxiulong authored Nov 17, 2021
  
  cdf81784
- followStatusPhone null · b1cc417c
  jiangxiulong authored Nov 17, 2021
  
  b1cc417c
- add try applyrefund · 939c980d
  jiangxiulong authored Nov 17, 2021
  
  939c980d
- 退款减积分 · 6508d91a
  jiangxiulong authored Nov 17, 2021
  
  6508d91a
- 下线 · 5c1186ea
  jiangxiulong authored Nov 17, 2021
  
  5c1186ea
16 Nov, 2021 13 commits
- 修改缺陷 · 3b7ed63e
  dongchun authored Nov 16, 2021
  
  3b7ed63e
- setTotal · 9d94d5d9
  jiangxiulong authored Nov 16, 2021
  
  9d94d5d9
- getTimeType · 402ea02d
  jiangxiulong authored Nov 16, 2021
  
  402ea02d
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · 992147d4
  jiangxiulong authored Nov 16, 2021
  
  992147d4
- getTimeType · 3afaa51f
  jiangxiulong authored Nov 16, 2021
  
  3afaa51f
- 修改 orderTicket 实体类 · aae66e5e
  胡佳晨 authored Nov 16, 2021
  
  aae66e5e
- 划卡调任务优化 · 84992c17
  sunyuntian authored Nov 16, 2021
  
  84992c17
- 修改 orderTicket 实体类 · be497fa0
  胡佳晨 authored Nov 16, 2021
  
  be497fa0
- receivingAddressesId · 633f48a9
  jiangxiulong authored Nov 16, 2021
  
  633f48a9
- 用户中奖列表增加地址信息 · 64254df8
  jiangxiulong authored Nov 16, 2021
  
  64254df8
- 中奖详情增加活动快递方式 · 9fbd95ff
  jiangxiulong authored Nov 16, 2021
  
  9fbd95ff
- 脚本修改,增加历史积分不拦截每月上限,增加字段积分过期时间 · aee26e99
  胡佳晨 authored Nov 16, 2021
  
  aee26e99
- 脚本修改,增加历史积分不拦截每月上限 · e85d3763
  胡佳晨 authored Nov 16, 2021
  
  e85d3763
15 Nov, 2021 14 commits
- 划卡做任务注释 · 85d65c0a
  胡佳晨 authored Nov 15, 2021
  
  85d65c0a
- 修改前端bug · 6c59309e
  dongchun authored Nov 15, 2021
  
  6c59309e
- 修改前端bug · beef231c
  dongchun authored Nov 15, 2021
  
  beef231c
- Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115 · d6643631
  dongchun authored Nov 15, 2021
  
  d6643631
- 修改前端bug · 63072456
  dongchun authored Nov 15, 2021
  
  63072456
- 划卡调任务优化 · 02b8eaa9
  sunyuntian authored Nov 15, 2021
  
  02b8eaa9
- 修改前端bug · 1ff7d427
  dongchun authored Nov 15, 2021
  
  1ff7d427
- 开始结束时间类型 · aa934f36
  jiangxiulong authored Nov 15, 2021
  
  aa934f36
- 划卡优化 · 2bb1eb8f
  胡佳晨 authored Nov 15, 2021
  
  2bb1eb8f
- Merge branch 'master' into dev_20111115 · db54c6ce
  胡佳晨 authored Nov 15, 2021
```
# Conflicts:
#	liquidnet-bus-config/liquidnet-config/application-dev.yml
#	liquidnet-bus-config/liquidnet-config/application-test.yml
```
  db54c6ce
- Merge branch 'master_1' into 'master' · a069696e
  Administrator authored Nov 15, 2021
```
修改配置文件 不影响线上 39.107.71.112

See merge request !117
```
  a069696e
- 修改配置文件不影响线上 39.107.71.112 · 153d478a
  胡佳晨 authored Nov 15, 2021
  
  153d478a
- Update application-dev.yml · f1e0a375
  Administrator authored Nov 15, 2021
  
  f1e0a375
- Update application-test.yml · 2c72fd97
  Administrator authored Nov 15, 2021
  
  2c72fd97