Commits · 99e178ba0d801c8401c701f9c127499b3bc4f369 · 邓莹莹 / backend_auto

23 Jul, 2021 14 commits
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · 99e178ba
  冯艮霞 authored Jul 23, 2021
  
  99e178ba
- 我的-收藏-tab · 456751f2
  冯艮霞 authored Jul 23, 2021
  
  456751f2
- 次卡订单详情页case完善 · 8f5e2002
  张慧 authored Jul 23, 2021
  
  8f5e2002
- 修复冲突 · edf059f6
  张慧 authored Jul 23, 2021
  
  edf059f6
- merge · 615aa36d
  张伟男 authored Jul 23, 2021
  
  615aa36d
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · 236825bb
  张伟男 authored Jul 23, 2021
  
  236825bb
- merge common_dev · 9f3c84ca
  张伟男 authored Jul 23, 2021
  
  9f3c84ca
- AI,beautycard · c95b57d7
  张伟男 authored Jul 23, 2021
  
  c95b57d7
- Merge branch 'common_dev' into ly_dev · 8a719179
  林颖 authored Jul 23, 2021
  
  8a719179
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · 0600a375
  林颖 authored Jul 23, 2021
```
# Conflicts:
#	all_backend_api/tag_request.py
#	all_backend_api/tag_request.yaml
```
  0600a375
- 次卡商祥页-适用机构列表接口case完善 · 588e153f
  张慧 authored Jul 23, 2021
  
  588e153f
- 日记本关联-医生&医院 · 1196530d
  林颖 authored Jul 23, 2021
  
  1196530d
- Merge branch 'common_dev' into crk_dev · 370b4129
  edz authored Jul 23, 2021
  
  370b4129
- 直播-新增标签 · e90b6fd2
  edz authored Jul 23, 2021
  
  e90b6fd2
22 Jul, 2021 6 commits
- 主播-分享 · db969359
  aha authored Jul 22, 2021
  
  db969359
- Merge branch 'cuixin_dev' into common_dev · 68c06066
  aha authored Jul 22, 2021
  
  68c06066
- zhubo fenxiang · c89c5b57
  aha authored Jul 22, 2021
  
  c89c5b57
- merge cuixin_dev · f5462cba
  aha authored Jul 22, 2021
  
  f5462cba
- merge common_dev · cc49eba8
  aha authored Jul 22, 2021
  
  cc49eba8
- zhubo finish · 94aadca8
  aha authored Jul 22, 2021
  
  94aadca8
21 Jul, 2021 4 commits
- 123 · 734b439a
  edz authored Jul 21, 2021
  
  734b439a
- 直播-主播获取美颜/更改美颜 · d8ae1de7
  edz authored Jul 21, 2021
  
  d8ae1de7
- 我的-收藏 · a475b175
  冯艮霞 authored Jul 21, 2021
  
  a475b175
- 我的-收藏 · e8e9ad79
  冯艮霞 authored Jul 21, 2021
  
  e8e9ad79
20 Jul, 2021 2 commits
- 主播标记商品/取消标记 · 6292c508
  aha authored Jul 20, 2021
  
  6292c508
- merge common_dev 0720 · 9cc43660
  aha authored Jul 20, 2021
  
  9cc43660
16 Jul, 2021 14 commits
- Merge branch 'common_dev' into zhanghui_dev · c000a00b
  张慧 authored Jul 16, 2021
```
次卡用例完善
```
  c000a00b
- 次卡商祥页case完善 · d15b8ce9
  张慧 authored Jul 16, 2021
  
  d15b8ce9
- merge common_dev · 9d73b4e0
  aha authored Jul 16, 2021
  
  9d73b4e0
- Merge branch 'common_dev' into cuixin_dev · 60844b74
  aha authored Jul 16, 2021
  
  60844b74
- 直播 · e1ce206b
  aha authored Jul 16, 2021
  
  e1ce206b
- Merge branch 'common_dev' into zwn_dev · df80bd32
  张伟男 authored Jul 16, 2021
  
  df80bd32
- AI · b47b8e4a
  张伟男 authored Jul 16, 2021
  
  b47b8e4a
- Merge branch 'common_dev' into ly_dev · 2c32802b
  林颖 authored Jul 16, 2021
  
  2c32802b
- 我的-帖子 · cf518550
  冯艮霞 authored Jul 16, 2021
  
  cf518550
- 帖子 · 6905078a
  冯艮霞 authored Jul 16, 2021
  
  6905078a
- Merge branch 'common_dev' of http://git.wanmeizhensuo.com/dengyingying/backend_auto into common_dev · f95992be
  林颖 authored Jul 16, 2021
  
  f95992be
- 发帖子--选择标签，医院，订单---补充 · 5bc354ec
  林颖 authored Jul 16, 2021
  
  5bc354ec
- 发帖子--选择标签，医院，订单 · 326a62cb
  林颖 authored Jul 16, 2021
  
  326a62cb
- 解决冲突 · 243d8efc
  edz authored Jul 16, 2021
  
  243d8efc