Commits · 36af48b624ff9757c02368a42ff3188e18f596ab · 邓莹莹 / backend_auto

13 Aug, 2021 1 commit
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · 36af48b6
  林颖 authored Aug 13, 2021
  
  36af48b6
09 Aug, 2021 2 commits
- Merge branch 'cuixin_dev' into common_dev · 789f4d52
  aha authored Aug 09, 2021
  
  789f4d52
- 更美次卡-按次卡sku_id导入，导入校验//////更美次卡-获取已添加页面次卡spu/sku列表用例修改 · 1a865cf0
  aha authored Aug 09, 2021
  
  1a865cf0
03 Aug, 2021 5 commits
- merge cuixin_dev 0803 · fdd50e46
  aha authored Aug 03, 2021
  
  fdd50e46
- merge common_dev 0803 · 0c02f49c
  aha authored Aug 03, 2021
  
  0c02f49c
- Merge branch 'common_dev' into cuixin_dev · 34ff40e0
  aha authored Aug 03, 2021
  
  34ff40e0
- 直播回放-查看直播间弹幕 · 5d49fe8f
  aha authored Aug 03, 2021
  
  5d49fe8f
- 直播回放-进入直播间 · 2248fd83
  aha authored Aug 03, 2021
  
  2248fd83
02 Aug, 2021 11 commits
- Merge branch 'ly_dev' into common_dev · 69d4f3f3
  林颖 authored Aug 02, 2021
```
# Conflicts:
#	test_backend_data/topic_data/topic_reply_create.yaml
```
  69d4f3f3
- Merge branch 'ly_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into ly_dev · c46c29eb
  林颖 authored Aug 02, 2021
  
  c46c29eb
- 历史每月推广明细 · 719174ec
  张淑琴 authored Aug 02, 2021
  
  719174ec
- Merge branch 'ly_dev' into common_dev · e6a292c0
  林颖 authored Aug 02, 2021
```
# Conflicts:
#	test_backend_data/topic_data/topic_reply_create.yaml
```
  e6a292c0
- 主播-推荐袋添加尾款券(主播账号为机构或医生) · 7363daf8
  aha authored Aug 02, 2021
  
  7363daf8
- Merge branch 'common_dev' into zzsq_dev · af75b689
  张淑琴 authored Aug 02, 2021
  
  af75b689
- 导出 · 1e372194
  张淑琴 authored Aug 02, 2021
  
  1e372194
- 推广明细 · 18e445a0
  张淑琴 authored Aug 02, 2021
  
  18e445a0
- Merge branch 'common_dev' into crk_dev · 628c57a8
  edz authored Aug 02, 2021
  
  628c57a8
- 直播间私信主播 · 9e7ba03f
  edz authored Aug 02, 2021
  
  9e7ba03f
- 添加忽略文件 · 26092d53
  林颖 authored Aug 02, 2021
  
  26092d53
30 Jul, 2021 16 commits
- 测试忽略文件-- · bfafccca
  林颖 authored Jul 30, 2021
  
  bfafccca
- 测试忽略文件-- · b6f009b8
  林颖 authored Jul 30, 2021
```
指定忽略某个文件
```
  b6f009b8
- 0730 · 39c06d5e
  aha authored Jul 30, 2021
  
  39c06d5e
- 0730 · e7ada468
  aha authored Jul 30, 2021
  
  e7ada468
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · f7b82a29
  aha authored Jul 30, 2021
  
  f7b82a29
- merge cuixin_dev · 7e0cc8a3
  aha authored Jul 30, 2021
  
  7e0cc8a3
- merge common_dev · 01422133
  aha authored Jul 30, 2021
  
  01422133
- Merge branch 'common_dev' into cuixin_dev · 979c1da3
  aha authored Jul 30, 2021
  
  979c1da3
- 我的-收藏-帖子-回答-头像点击 · 66fbb5d2
  冯艮霞 authored Jul 30, 2021
  
  66fbb5d2
- om后台-弹出美券、用户-领取美券 · 491f1609
  aha authored Jul 30, 2021
  
  491f1609
- Merge branch 'common_dev' into zzsq_dev · 0aae8b30
  张淑琴 authored Jul 30, 2021
  
  0aae8b30
- 关联美购 · 15261c6c
  张淑琴 authored Jul 30, 2021
  
  15261c6c
- 解决冲突 · c5603cc1
  edz authored Jul 30, 2021
  
  c5603cc1
- om后台批量添加直播间商品 · 76bd138f
  edz authored Jul 30, 2021
  
  76bd138f
- om · d0ce4e0b
  edz authored Jul 30, 2021
  
  d0ce4e0b
- 日记本查看大图召回美购 · f22e8432
  林颖 authored Jul 30, 2021
  
  f22e8432
29 Jul, 2021 2 commits
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · c0f0da5d
  林颖 authored Jul 29, 2021
  
  c0f0da5d
- 日记本点赞&取消点赞&各个详情页预置词返回 · 87849717
  林颖 authored Jul 29, 2021
  
  87849717
28 Jul, 2021 3 commits
- merge cuixin_dev 0728 · b23d501d
  aha authored Jul 28, 2021
  
  b23d501d
- 主播添加商品后，购物车上方弹出商品卡片 · 8a791c22
  aha authored Jul 28, 2021
  
  8a791c22
- merge common_dev 0728 · 18af6ea7
  aha authored Jul 28, 2021
  
  18af6ea7