Commits · 0ac5a0840a493d3f7bf13c5593000328aefcc067 · bp / goods

11 Oct, 2021 7 commits
- Merge branch 'pindan_activity_list_optimize' into test · 0ac5a084
  pengfei authored Oct 11, 2021
```
# Conflicts:
#	composer.json
#	composer.lock
#	vendor/composer/installed.json
#	vendor/composer/installed.php
```
  0ac5a084
- update getPlaceOrderGoodsList default spu · cfcea5ce
  pengfei authored Oct 11, 2021
  
  cfcea5ce
- update getPlaceOrderGoodsList default spu · b6ca4978
  pengfei authored Oct 11, 2021
  
  b6ca4978
- Merge branch 'master' into pindan_activity_list_optimize · 8c57b5df
  pengfei authored Oct 11, 2021
  
  8c57b5df
- Merge branch 'feature_optimize_order_create_refund' into pindan_activity_list_optimize · 8bcf4677
  pengfei authored Oct 11, 2021
```
# Conflicts:
#	composer.json
#	composer.lock
#	vendor/composer/installed.json
#	vendor/composer/installed.php
```
  8bcf4677
- Merge branch 'pindan_activity_list_optimize' into test · 4c911a1a
  suntengda authored Oct 11, 2021
  
  4c911a1a
- update 拼单小程序活动列表新版接口运营位配置修改 · fc87f3c9
  suntengda authored Oct 11, 2021
  
  fc87f3c9
09 Oct, 2021 14 commits
- update 拼单小程序活动列表新版接口活动推荐修改 · c41caf69
  suntengda authored Oct 09, 2021
  
  c41caf69
- update 拼单小程序活动列表新版接口活动推荐修改 · a27d09e3
  suntengda authored Oct 09, 2021
  
  a27d09e3
- Merge branch 'test' of https://gitlab.yidian-inc.com/bp/goods into test · b64d3ffb
  jianghaiming authored Oct 09, 2021
  
  b64d3ffb
- Merge branch 'ledger20211008' into test · 81cd89df
  jianghaiming authored Oct 09, 2021
  
  81cd89df
- update:修改活动查询 · 9498d081
  jianghaiming authored Oct 09, 2021
  
  9498d081
- Merge branch 'pindan_activity_list_optimize' into test · 1382c2fb
  suntengda authored Oct 09, 2021
  
  1382c2fb
- update 拼单小程序活动列表新版接口支付成功页运营位配置测试 · 02b33655
  suntengda authored Oct 09, 2021
  
  02b33655
- Merge branch 'ledger20211008' into test · bebdf643
  jianghaiming authored Oct 09, 2021
  
  bebdf643
- update:添加获取东西接口 · dc53fb65
  jianghaiming authored Oct 09, 2021
  
  dc53fb65
- Merge branch 'pindan_activity_list_optimize' into test · 25fd797a
  jianghaiming authored Oct 09, 2021
  
  25fd797a
- update:修改获取链接 · f071c65b
  jianghaiming authored Oct 09, 2021
  
  f071c65b
- update:修改 · 6d02dfee
  jianghaiming authored Oct 09, 2021
  
  6d02dfee
- update:活动商品数量 · b9e81570
  jianghaiming authored Oct 09, 2021
  
  b9e81570
- update:修改 · bae1c94b
  jianghaiming authored Oct 09, 2021
  
  bae1c94b
08 Oct, 2021 5 commits
- Merge branch 'pindan_activity_list_optimize' into test · 06c64c47
  suntengda authored Oct 08, 2021
  
  06c64c47
- add 拼单小程序活动列表新版接口空数据判断逻辑 · 8f8bc41a
  suntengda authored Oct 08, 2021
  
  8f8bc41a
- Merge branch 'wx_user_20210929' into test · efecb871
  jianghaiming authored Oct 08, 2021
  
  efecb871
- update:修改时间 · f5eb1825
  jianghaiming authored Oct 08, 2021
  
  f5eb1825
- update:修改时间 · 0b097ad4
  jianghaiming authored Oct 08, 2021
  
  0b097ad4
29 Sep, 2021 8 commits
- update:修改 · 9b2fd912
  jianghaiming authored Sep 29, 2021
  
  9b2fd912
- update:Set · 6e3d59cd
  jianghaiming authored Sep 29, 2021
  
  6e3d59cd
- update:修改文案 · c45e3090
  jianghaiming authored Sep 29, 2021
  
  c45e3090
- update:修改冲突 · 7b4356b1
  jianghaiming authored Sep 29, 2021
  
  7b4356b1
- update:Se · 91132a3f
  jianghaiming authored Sep 29, 2021
  
  91132a3f
- Merge branch 'pindan_activity_list_optimize' into test · bb87474f
  jianghaiming authored Sep 29, 2021
  
  bb87474f
- update:修改插入活动id生成链接 · 470993d5
  jianghaiming authored Sep 29, 2021
  
  470993d5
- update:修改登陆配置 · f7c2e2f3
  jianghaiming authored Sep 29, 2021
  
  f7c2e2f3
28 Sep, 2021 6 commits
- Merge branch 'feature-deliver210913' into test · 494311b7
  jianghaiming authored Sep 28, 2021
  
  494311b7
- update:修改 · fcf56420
  jianghaiming authored Sep 28, 2021
  
  fcf56420
- Merge branch 'feature-deliver210913' into test · 2a79ad60
  jianghaiming authored Sep 28, 2021
  
  2a79ad60
- update:修改绑定手机 · 948b81af
  jianghaiming authored Sep 28, 2021
  
  948b81af
- Merge branch 'feature-deliver210913' into test · 899a3be5
  jianghaiming authored Sep 28, 2021
  
  899a3be5
- update:修改提示文案 · 96e5c17b
  jianghaiming authored Sep 28, 2021
  
  96e5c17b