Commits · 9337a3eee84d9507a96520f7ba3606bd756de98c · bp / goods

09 Oct, 2021 9 commits
- Merge branch 'ledger20211008' into develop · 9337a3ee
  jianghaiming authored Oct 09, 2021
  
  9337a3ee
- update:添加获取东西接口 · dc53fb65
  jianghaiming authored Oct 09, 2021
  
  dc53fb65
- Merge branch 'pindan_activity_list_optimize' into develop · 9b6db038
  jianghaiming authored Oct 09, 2021
  
  9b6db038
- update:修改获取链接 · f071c65b
  jianghaiming authored Oct 09, 2021
  
  f071c65b
- update:修改 · 6d02dfee
  jianghaiming authored Oct 09, 2021
  
  6d02dfee
- Merge branch 'develop' of https://gitlab.yidian-inc.com/bp/goods into develop · 3ed8e997
  jianghaiming authored Oct 09, 2021
  
  3ed8e997
- Merge branch 'pindan_activity_list_optimize' into develop · d2c8b099
  jianghaiming authored Oct 09, 2021
  
  d2c8b099
- 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 develop · 2e6b5e5f
  suntengda authored Oct 08, 2021
  
  2e6b5e5f
- add 拼单小程序活动列表新版接口空数据判断逻辑 · 8f8bc41a
  suntengda authored Oct 08, 2021
  
  8f8bc41a
- Merge branch 'wx_user_20210929' into develop · 769d01f1
  jianghaiming authored Oct 08, 2021
  
  769d01f1
- update:修改时间 · f5eb1825
  jianghaiming authored Oct 08, 2021
  
  f5eb1825
- update:修改时间 · 0b097ad4
  jianghaiming authored Oct 08, 2021
  
  0b097ad4
29 Sep, 2021 10 commits
- Merge branch 'pindan_activity_list_optimize' into develop · 5f237ac1
  jianghaiming authored Sep 29, 2021
  
  5f237ac1
- Merge branch 'wx_user_20210929' into develop · 2ccdca60
  jianghaiming authored Sep 29, 2021
  
  2ccdca60
- update:修改 · 9b2fd912
  jianghaiming authored Sep 29, 2021
  
  9b2fd912
- Merge branch 'wx_user_20210929' into develop · 7ea80ddd
  jianghaiming authored Sep 29, 2021
  
  7ea80ddd
- update:Set · 6e3d59cd
  jianghaiming authored Sep 29, 2021
  
  6e3d59cd
- update:修改文案 · c45e3090
  jianghaiming authored Sep 29, 2021
  
  c45e3090
- update:修改冲突 · ccebc0c4
  jianghaiming authored Sep 29, 2021
  
  ccebc0c4
- update:Se · 91132a3f
  jianghaiming authored Sep 29, 2021
  
  91132a3f
- update:修改插入活动id生成链接 · 470993d5
  jianghaiming authored Sep 29, 2021
  
  470993d5
- update:修改登陆配置 · f7c2e2f3
  jianghaiming authored Sep 29, 2021
  
  f7c2e2f3
28 Sep, 2021 6 commits
- update: 处理冲突 · ace9831e
  luhongguang authored Sep 28, 2021
  
  ace9831e
- Merge branch 'pindan_activity_list_optimize' into develop · 141eeeed
  suntengda authored Sep 28, 2021
  
  141eeeed
- add 拼单小程序活动列表新版接口进行中接口修改 · 7e5019b9
  suntengda authored Sep 28, 2021
  
  7e5019b9
- update: 二手商品add · 2461212a
  luhongguang authored Sep 28, 2021
  
  2461212a
- update:修改 · db9688ec
  jianghaiming authored Sep 28, 2021
  
  db9688ec
- Merge branch 'master' into dev_ershou_20210927 · 86860711
  luhongguang authored Sep 28, 2021
  
  86860711
27 Sep, 2021 8 commits
- Merge branch 'pre_release' into 'master' · f56a963d
  卢洪光 authored Sep 27, 2021
```
Pre release

See merge request bp/goods!75
```
  f56a963d
- update composer · 9a89ddce
  pengfei authored Sep 27, 2021
  
  9a89ddce
- Merge branch 'pindan_activity_list_optimize' into develop · 5f530313
  suntengda authored Sep 27, 2021
  
  5f530313
- add 拼单小程序活动列表新版接口拼单活动推荐位接口修改 · 128a59c3
  suntengda authored Sep 27, 2021
  
  128a59c3
- Merge branch 'pindan_activity_list_optimize' into develop · 6b317be3
  jianghaiming authored Sep 27, 2021
  
  6b317be3
- Merge branch 'feature_optimize_order_create_refund' into develop · 20910658
  pengfei authored Sep 27, 2021
```
# Conflicts:
#	composer.json
#	composer.lock
#	vendor/composer/installed.json
#	vendor/composer/installed.php
```
  20910658
- update optimize_order_create goods_type is empty default goods_sku · 3568ab33
  pengfei authored Sep 27, 2021
  
  3568ab33
- Merge branch 'feature_take_place_20210916' into 'pre_release' · a65c7e76
  卢洪光 authored Sep 27, 2021
```
Feature take place 20210916

See merge request bp/goods!74
```
  a65c7e76
26 Sep, 2021 2 commits
- Merge branch 'feature-deliver210913' into develop · efe771ad
  luhongguang authored Sep 26, 2021
  
  efe771ad
- Merge branch 'feature_take_place_20210916' into feature-deliver210913 · c8b062d9
  luhongguang authored Sep 26, 2021
  
  c8b062d9