Commits · f10de4cca719a53f449856237393a545b30b2e16 · bp / goods

01 Sep, 2021 6 commits
- Merge branch 'colonel' into develop · f10de4cc
  pengfei authored Sep 01, 2021
```
# Conflicts:
#	application/services/marketing/MarketingService.php
```
  f10de4cc
- Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel · 9f9f48ab
  pengfei authored Sep 01, 2021
  
  9f9f48ab
- update 团长分销-奖励脚本增加日志 · 30bf371e
  pengfei authored Sep 01, 2021
  
  30bf371e
- update 拼团活动列表排序规则，时间范围修改 · d789e29e
  suntengda authored Sep 01, 2021
  
  d789e29e
- update 拼团活动列表排序规则，时间范围修改 · 2e1ec5ad
  suntengda authored Sep 01, 2021
  
  2e1ec5ad
- Merge branch 'master' into colonel · f2449dd3
  suntengda authored Sep 01, 2021
  
  f2449dd3
31 Aug, 2021 33 commits
- Merge branch 'master' into marketing_luhongguang · 5d3bf93c
  luhongguang authored Aug 31, 2021
  
  5d3bf93c
- update: 统计数量 · b2fa4d2f
  luhongguang authored Aug 31, 2021
  
  b2fa4d2f
- Merge branch 'tuancan' into colonel · 7a8efce7
  suntengda authored Aug 31, 2021
  
  7a8efce7
- update 拼团活动列表排序规则，时间范围修改 · 08ec9025
  suntengda authored Aug 31, 2021
  
  08ec9025
- Merge branch 'master' into tuancan · fa30082d
  suntengda authored Aug 31, 2021
  
  fa30082d
- Merge branch 'hotfix_take_place_list' into 'master' · 1048e34c
  崔伟峰 authored Aug 31, 2021
```
fixed:take place bug

See merge request bp/goods!25
```
  1048e34c
- fixed:take place bug · 5ccdcd2c
  mengweifu authored Aug 31, 2021
  
  5ccdcd2c
- update:修改文案 · dcbbff99
  jianghaiming authored Aug 30, 2021
  
  dcbbff99
- update:修改提示文案 · 2ac179ef
  jianghaiming authored Aug 30, 2021
  
  2ac179ef
- update:修改冲突文案 · 85c0a996
  jianghaiming authored Aug 27, 2021
  
  85c0a996
- update:添加是否有下一页 · 75d24211
  jianghaiming authored Aug 27, 2021
  
  75d24211
- update:修改分页 · 816155df
  jianghaiming authored Aug 27, 2021
  
  816155df
- update:修改分页 · fbeb2d99
  jianghaiming authored Aug 27, 2021
  
  fbeb2d99
- update:Set · f8b4aa38
  jianghaiming authored Aug 26, 2021
  
  f8b4aa38
- update:修改商品金额不能大于售价 · 8bd75dd4
  jianghaiming authored Aug 26, 2021
  
  8bd75dd4
- update:set · 23f7fe28
  jianghaiming authored Aug 26, 2021
  
  23f7fe28
- updateS:et · c52256e5
  jianghaiming authored Aug 24, 2021
  
  c52256e5
- update 团长分销-azkaban schedule params · 9dcdc04b
  pengfei authored Aug 31, 2021
  
  9dcdc04b
- update: 处理冲突 · 21868e23
  luhongguang authored Aug 31, 2021
  
  21868e23
- Merge branch 'marketing_luhongguang' into develop · cb85a8af
  luhongguang authored Aug 31, 2021
  
  cb85a8af
- update: 拼单活动add · 369ce840
  luhongguang authored Aug 31, 2021
  
  369ce840
- add 团长分销-Azkaban schedule · b9facab0
  pengfei authored Aug 31, 2021
  
  b9facab0
- Merge branch 'marketing_luhongguang' into develop · b75db494
  luhongguang authored Aug 31, 2021
  
  b75db494
- update: 参与人数 · 8ec88998
  luhongguang authored Aug 31, 2021
  
  8ec88998
- update add azkaban Colonel schedule · 6b2754a9
  pengfei authored Aug 31, 2021
  
  6b2754a9
- update add azkaban Colonel schedule · 25acae72
  pengfei authored Aug 31, 2021
  
  25acae72
- merge colonel · 8b2538ef
  pengfei authored Aug 31, 2021
  
  8b2538ef
- update: 拼单活动商品排序 · db197299
  luhongguang authored Aug 31, 2021
  
  db197299
- Merge branch 'feature_mwf_azkaban' into colonel · bac35162
  pengfei authored Aug 31, 2021
  
  bac35162
- merge master · 79337290
  pengfei authored Aug 31, 2021
  
  79337290
- update 团长分销-修改异常code重复 · 26f7cb21
  pengfei authored Aug 31, 2021
  
  26f7cb21
- update 团长分销-细化团长审核错误提示 · fa001575
  pengfei authored Aug 31, 2021
  
  fa001575
- update 团长分销-奖励脚本 · 126a3371
  pengfei authored Aug 31, 2021
  
  126a3371
30 Aug, 2021 1 commit
- Merge branch 'marketing_20210824' · a4fa1e3c
  jianghaiming authored Aug 30, 2021
  
  a4fa1e3c