Commits · f011efb5d78790ce25f4f9764e64a70f6f4336fe · bp / goods

02 Sep, 2021 4 commits
- Merge branch 'colonel' into develop · f011efb5
  pengfei authored Sep 02, 2021
  
  f011efb5
- update 团长分销脚本-替换位置到job执行 · b61d4953
  pengfei authored Sep 02, 2021
  
  b61d4953
- update 团长分销脚本-替换位置到job执行 · f6af5ba4
  pengfei authored Sep 02, 2021
  
  f6af5ba4
- Merge branch 'master' into colonel · d3caae4c
  luhongguang authored Sep 02, 2021
  
  d3caae4c
01 Sep, 2021 31 commits
- Merge branch 'colonel' into develop · 8d194313
  pengfei authored Sep 01, 2021
  
  8d194313
- update 团长分销脚本 · be6cf870
  pengfei authored Sep 01, 2021
  
  be6cf870
- update 修改团长分销-奖励脚本 · c80c94bf
  pengfei authored Sep 01, 2021
  
  c80c94bf
- Merge branch 'colonel' into develop · 8629dfeb
  pengfei authored Sep 01, 2021
  
  8629dfeb
- update 团长分销奖励脚本 · c6368d49
  pengfei authored Sep 01, 2021
  
  c6368d49
- Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop · 39562a78
  pengfei authored Sep 01, 2021
  
  39562a78
- Merge branch 'colonel' into develop · 8edb699e
  pengfei authored Sep 01, 2021
  
  8edb699e
- update 团长分销-增加默认server addr · 12c45840
  pengfei authored Sep 01, 2021
  
  12c45840
- Merge branch 'colonel' into develop · 2b4d2b74
  pengfei authored Sep 01, 2021
  
  2b4d2b74
- update 团长分销-奖励结算脚本,奖励表主键id修改 · d7e90a2b
  pengfei authored Sep 01, 2021
  
  d7e90a2b
- Merge branch 'tuancan' into develop · e5fe6316
  suntengda authored Sep 01, 2021
  
  e5fe6316
- update app内团餐列表接口 · 9c3fc79b
  suntengda authored Sep 01, 2021
  
  9c3fc79b
- update 修改团长奖励脚本 · 1642fbfd
  pengfei authored Sep 01, 2021
  
  1642fbfd
- Merge branch 'colonel' into develop · 91fe0111
  pengfei authored Sep 01, 2021
  
  91fe0111
- Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop · a389efad
  pengfei authored Sep 01, 2021
  
  a389efad
- update 团长分销-团长申请列表-自提点按钮状态 · f7e6520c
  pengfei authored Sep 01, 2021
  
  f7e6520c
- Merge branch 'online_time' into 'master' · faa0cb5c
  强海明 authored Sep 01, 2021
```
Online time

See merge request bp/goods!26
```
  faa0cb5c
- Merge branch 'tuancan' into develop · 4c7a59cf
  suntengda authored Sep 01, 2021
  
  4c7a59cf
- update 发送订阅消息传递参数增加活动id-站内消息用 · f0854640
  suntengda authored Sep 01, 2021
  
  f0854640
- Merge branch 'colonel' into develop · 23d1c481
  pengfei authored Sep 01, 2021
  
  23d1c481
- update 团长分销-计算奖励脚本 · 7d24683c
  pengfei authored Sep 01, 2021
  
  7d24683c
- Merge branch 'tuancan' into develop · efb09faf
  suntengda authored Sep 01, 2021
```
# Conflicts:
#	application/modules/Marketing/controllers/Marketing.php
#	application/services/marketing/MarketingService.php
```
  efb09faf
- add app内团餐列表接口 · f7a3b1ef
  suntengda authored Sep 01, 2021
  
  f7a3b1ef
- update 拼单活动列表传参是否获取下单用户数 · 6316744f
  suntengda authored Sep 01, 2021
  
  6316744f
- 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 tuancan · dfb29af6
  suntengda authored Sep 01, 2021
  
  dfb29af6
- Merge branch 'master' into colonel · f2449dd3
  suntengda authored Sep 01, 2021
  
  f2449dd3
31 Aug, 2021 5 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