Commits · 1c3479053b8f463ca7c3bce76d73dc3903e44ab8 · bp / goods · GitLab

26 Sep, 2021 3 commits
- Merge branch 'test' of https://gitlab.yidian-inc.com/bp/goods into test · 1c347905
  jianghaiming authored Sep 26, 2021
  
  1c347905
- Merge branch 'feature-deliver210913' into test · 80c0b8c0
  luhongguang authored Sep 26, 2021
  
  80c0b8c0
- Merge branch 'feature_take_place_20210916' into feature-deliver210913 · c8b062d9
  luhongguang authored Sep 26, 2021
  
  c8b062d9
24 Sep, 2021 16 commits
- Merge branch 'test' of https://gitlab.yidian-inc.com/bp/goods into test · 9ae13279
  jianghaiming authored Sep 24, 2021
  
  9ae13279
- Merge branch 'feature-deliver210913' into test · 1f553db0
  jianghaiming authored Sep 24, 2021
  
  1f553db0
- update:修改 · bd1b9cd3
  jianghaiming authored Sep 24, 2021
  
  bd1b9cd3
- Merge branch 'pindan_activity_list_optimize' into test · a2c83a56
  suntengda authored Sep 24, 2021
  
  a2c83a56
- update 拼单小程序活动列表新版接口获取活动运营配置接口 · 2fa8db99
  suntengda authored Sep 24, 2021
  
  2fa8db99
- Merge branch 'test' of https://gitlab.yidian-inc.com/bp/goods into test · 12031a84
  jianghaiming authored Sep 24, 2021
  
  12031a84
- update:修改 · a5c5b054
  jianghaiming authored Sep 24, 2021
  
  a5c5b054
- update:set · 76c680a6
  jianghaiming authored Sep 24, 2021
  
  76c680a6
- update: 处理报错 · 27bc4c4b
  luhongguang authored Sep 24, 2021
  
  27bc4c4b
- Merge branch 'feature_optimize_order_create_refund' into test · c2697bcd
  pengfei authored Sep 24, 2021
  
  c2697bcd
- Merge branch 'master' into feature_optimize_order_create_refund · ba74c43c
  pengfei authored Sep 24, 2021
  
  ba74c43c
- update:修改 · a6f04b84
  jianghaiming authored Sep 24, 2021
  
  a6f04b84
- Merge branch 'test' of https://gitlab.yidian-inc.com/bp/goods into test · ac116b72
  jianghaiming authored Sep 24, 2021
  
  ac116b72
- update:修改登陆 · 127733f3
  jianghaiming authored Sep 24, 2021
  
  127733f3
- update:骑手登陆 · 8f0dc1ea
  jianghaiming authored Sep 24, 2021
  
  8f0dc1ea
- update:起手登陆 · 50172c97
  jianghaiming authored Sep 24, 2021
  
  50172c97
23 Sep, 2021 4 commits
- Merge branch 'pindan_activity_list_optimize' into test · 4458a654
  suntengda authored Sep 23, 2021
  
  4458a654
- update 拼单小程序活动列表新版接口获取活动运营配置接口 · ce27e9dc
  suntengda authored Sep 23, 2021
  
  ce27e9dc
- Merge branch 'feature_take_place_20210916' into test · 074a349e
  luhongguang authored Sep 23, 2021
  
  074a349e
- update: tag_ids 参数处理 · c80630c7
  luhongguang authored Sep 23, 2021
  
  c80630c7
22 Sep, 2021 6 commits
- Merge branch 'pindan_activity_list_optimize' into test · 4a1e53c2
  suntengda authored Sep 22, 2021
  
  4a1e53c2
- add 拼单小程序活动列表新版接口 sku图片修改 · 4ebddeaf
  suntengda authored Sep 22, 2021
  
  4ebddeaf
- update:tcc 创建文案 · b209f30b
  jianghaiming authored Sep 22, 2021
  
  b209f30b
- update:解决冲突 · b00b5b3f
  jianghaiming authored Sep 22, 2021
  
  b00b5b3f
- update:修改简网超时 · d2fdbda9
  jianghaiming authored Sep 22, 2021
  
  d2fdbda9
- update:修改简网超时时间 · e57aa42c
  jianghaiming authored Sep 22, 2021
  
  e57aa42c
18 Sep, 2021 2 commits
- Merge branch 'pindan_activity_list_optimize' into test · 9d491bad
  suntengda authored Sep 18, 2021
```
# Conflicts:
#	vendor/composer/installed.json
```
  9d491bad
- add 拼单小程序活动列表新版接口未开始活动不查订单信息 · e6d987c2
  suntengda authored Sep 18, 2021
  
  e6d987c2
17 Sep, 2021 8 commits
- add 拼单小程序活动列表新版接口并发调用订单接口 · 6fc755e9
  suntengda authored Sep 17, 2021
  
  6fc755e9
- add 拼单小程序活动列表新版接口并发获取图片 · 02372220
  suntengda authored Sep 17, 2021
  
  02372220
- Merge branch 'feature_take_place_20210916' into test · e1af227f
  luhongguang authored Sep 17, 2021
  
  e1af227f
- update: 优化 · f5e4ee3c
  luhongguang authored Sep 17, 2021
  
  f5e4ee3c
- add 拼单小程序活动列表新版接口 · 984dd218
  suntengda authored Sep 17, 2021
  
  984dd218
- add 拼单小程序活动列表新版接口 · e68ce8cc
  suntengda authored Sep 17, 2021
  
  e68ce8cc
- Merge branch 'feature_take_place_20210916' into test · fb7b7beb
  luhongguang authored Sep 17, 2021
  
  fb7b7beb
- update: 修改验证class · 50a883b1
  luhongguang authored Sep 17, 2021
  
  50a883b1
16 Sep, 2021 1 commit
- update: 后台自提点列表 · 8aef4bf0
  luhongguang authored Sep 16, 2021
  
  8aef4bf0