Commits · 18616a144f959ff62b57cc9f0cce27589d1665f7 · bp / goods

08 Sep, 2021 3 commits
- Merge branch 'colonel' into test · 18616a14
  suntengda authored Sep 08, 2021
  
  18616a14
- update 自提点默认按生活号id筛选条件 · 4ef0efd7
  suntengda authored Sep 08, 2021
  
  4ef0efd7
- Merge branch 'colonel' into test · a612b51e
  luhongguang authored Sep 08, 2021
  
  a612b51e
07 Sep, 2021 18 commits
- Merge branch 'tuancan' into test · f2ad1182
  suntengda authored Sep 07, 2021
  
  f2ad1182
- update 拼单详情页增加生活号管理员id · fab60d54
  suntengda authored Sep 07, 2021
  
  fab60d54
- Merge branch 'jiang_fix_20210906' into test · cbaf9a4e
  jianghaiming authored Sep 07, 2021
  
  cbaf9a4e
- update:修改为120秒 · e6f20154
  jianghaiming authored Sep 07, 2021
  
  e6f20154
- Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel · 26df326e
  luhongguang authored Sep 07, 2021
  
  26df326e
- Merge branch 'jiang_fix_20210907' into test · 4b9322fa
  jianghaiming authored Sep 07, 2021
  
  4b9322fa
- update:添加上下架 · 2e6c7bb7
  jianghaiming authored Sep 07, 2021
  
  2e6c7bb7
- Merge branch 'colonel' into test · 074a9cc3
  pengfei authored Sep 07, 2021
```
# Conflicts:
#	application/services/user/UserService.php
```
  074a9cc3
- update: config调整 · 786da8ce
  luhongguang authored Sep 07, 2021
  
  786da8ce
- Merge branch 'feature_jielong_native' into 'test' · 4a5995d9
  孟维甫 authored Sep 07, 2021
```
add:kafka

See merge request bp/goods!31
```
  4a5995d9
- add:kafka · bd87fc3e
  mengweifu authored Sep 07, 2021
  
  bd87fc3e
- update 团长分销-增加奖励脚本请求idgen服务异常报警 · d974dcc4
  pengfei authored Sep 07, 2021
  
  d974dcc4
- Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel · a760e4fd
  pengfei authored Sep 07, 2021
  
  a760e4fd
- update 团长分销-增加奖励脚本请求idgen服务异常报警 · fa50faa6
  pengfei authored Sep 07, 2021
  
  fa50faa6
- Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel · eac4daa5
  luhongguang authored Sep 07, 2021
  
  eac4daa5
- update: wechatLogin mon 埋点 · 4c276ea7
  luhongguang authored Sep 07, 2021
  
  4c276ea7
- Merge branch 'colonel' into test · 6c4f6a0d
  pengfei authored Sep 07, 2021
  
  6c4f6a0d
- update 团长分销-团长审核 · 1a1f019a
  pengfei authored Sep 07, 2021
  
  1a1f019a
06 Sep, 2021 19 commits
- Merge branch 'colonel' into test · 9385895f
  luhongguang authored Sep 06, 2021
  
  9385895f
- Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel · 0ae7ff6d
  luhongguang authored Sep 06, 2021
  
  0ae7ff6d
- update: 团长分销账单详情 · bc25e19e
  luhongguang authored Sep 06, 2021
  
  bc25e19e
- update 团长分销-团长列表昨日收益->未结算收益 · 92a20a6f
  pengfei authored Sep 06, 2021
  
  92a20a6f
- Merge branch 'jiang_fix_20210906' into test · b5224e42
  jianghaiming authored Sep 06, 2021
  
  b5224e42
- update:添加频率锁 · 671288a4
  jianghaiming authored Sep 06, 2021
  
  671288a4
- Merge branch 'test' of https://gitlab.yidian-inc.com/bp/goods into test · ade006e2
  jianghaiming authored Sep 06, 2021
  
  ade006e2
- Merge branch 'jiang_fix_20210906' into test · b18651ba
  jianghaiming authored Sep 06, 2021
  
  b18651ba
- update:添加频率锁 · 6eb88cf3
  jianghaiming authored Sep 06, 2021
  
  6eb88cf3
- Merge branch 'tuancan' into test · 3f0bd12f
  suntengda authored Sep 06, 2021
  
  3f0bd12f
- update 已结束列表 · 8554bfa0
  suntengda authored Sep 06, 2021
  
  8554bfa0
- Merge branch 'master' of https://gitlab.yidian-inc.com/bp/goods · 55be1fd3
  jianghaiming authored Sep 06, 2021
  
  55be1fd3
- Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel · 75bb2a35
  luhongguang authored Sep 06, 2021
  
  75bb2a35
- update: 未结算收益 · 3cfdc6d0
  luhongguang authored Sep 06, 2021
  
  3cfdc6d0
- Merge branch 'colonel' into test · 1ad8e559
  pengfei authored Sep 06, 2021
  
  1ad8e559
- Merge branch 'colonel' of https://git.yidian-inc.com:8021/bp/goods into colonel · fc3e9ad9
  pengfei authored Sep 06, 2021
  
  fc3e9ad9
- update composer update · 04de8dfb
  pengfei authored Sep 06, 2021
  
  04de8dfb
- update joblog · 8ac38a5c
  pengfei authored Sep 06, 2021
  
  8ac38a5c
- update: 未结算数据 · 1b4cf0c4
  luhongguang authored Sep 06, 2021
  
  1b4cf0c4