Commits · 548107714ea7814f3b884f1b86a44c096b80ff93 · bp / goods

19 Aug, 2021 1 commit
- update: 处理冲突 · 54810771
  luhongguang authored Aug 19, 2021
  
  54810771
18 Aug, 2021 4 commits
- Merge branch 'inventory' into test · c8f3979a
  luhongguang authored Aug 18, 2021
  
  c8f3979a
- update: 拼单商品库存逻辑调整 · 8da35fb1
  luhongguang authored Aug 18, 2021
  
  8da35fb1
- update:take place list · e2c94e70
  mengweifu authored Aug 18, 2021
  
  e2c94e70
- update:take place list · 85f0c7a5
  mengweifu authored Aug 18, 2021
  
  85f0c7a5
17 Aug, 2021 22 commits
- update: 通过goods_sku_id 获取拼单商品的ota信息 · b450b58c
  luhongguang authored Aug 17, 2021
  
  b450b58c
- Merge branch 'clear_price_0816' into test · a277e07a
  jianghaiming authored Aug 17, 2021
  
  a277e07a
- updateS:Et · e7c5b626
  jianghaiming authored Aug 17, 2021
  
  e7c5b626
- update:set · ddf8cf84
  jianghaiming authored Aug 17, 2021
  
  ddf8cf84
- Merge branch 'clear_price_0816' into test · e008e0b0
  jianghaiming authored Aug 17, 2021
  
  e008e0b0
- updateS:et · f9cd2fab
  jianghaiming authored Aug 17, 2021
  
  f9cd2fab
- Merge branch 'clear_price_0816' into test · 3b1776c0
  jianghaiming authored Aug 17, 2021
  
  3b1776c0
- update:SEt · b86f85eb
  jianghaiming authored Aug 17, 2021
  
  b86f85eb
- Merge branch 'clear_price_0816' into test · 80bef985
  jianghaiming authored Aug 17, 2021
  
  80bef985
- update:Set · 861a57fa
  jianghaiming authored Aug 17, 2021
  
  861a57fa
- Merge branch 'clear_price_0816' into test · d6f90fc8
  jianghaiming authored Aug 17, 2021
  
  d6f90fc8
- update:Set · 18ea4ea3
  jianghaiming authored Aug 17, 2021
  
  18ea4ea3
- updateS:Et · 37a14392
  jianghaiming authored Aug 17, 2021
  
  37a14392
- update: 活动详情接口调整 · 83829666
  luhongguang authored Aug 17, 2021
  
  83829666
- Merge branch 'master' into clear_price_0816 · 2fefaccd
  jianghaiming authored Aug 17, 2021
  
  2fefaccd
- Merge branch 'master' into pindan_temp · b3d2d4c6
  luhongguang authored Aug 17, 2021
  
  b3d2d4c6
- Merge branch 'test' of https://git.yidian-inc.com:8021/bp/goods into test · 0da7c929
  luhongguang authored Aug 17, 2021
  
  0da7c929
- Merge branch 'jiang_fix_0816' into test · 65a6a5e0
  luhongguang authored Aug 17, 2021
  
  65a6a5e0
- update: 修改错误变量 · 67e02da0
  luhongguang authored Aug 17, 2021
  
  67e02da0
- Merge branch 'clear_price_0816' into test · beac815e
  jianghaiming authored Aug 17, 2021
  
  beac815e
- update:set · 773840b3
  jianghaiming authored Aug 17, 2021
  
  773840b3
- update: 增加单人购买上限字段 · 4a1ef7bf
  luhongguang authored Aug 17, 2021
  
  4a1ef7bf
16 Aug, 2021 13 commits
- Merge branch 'master' into clear_price_0816 · a4346e07
  jianghaiming authored Aug 16, 2021
  
  a4346e07
- Merge branch 'jiang_fix_0816' into test · 9de71cb4
  jianghaiming authored Aug 16, 2021
  
  9de71cb4
- update:Set · eaeaa899
  jianghaiming authored Aug 16, 2021
  
  eaeaa899
- update:set · be24ea78
  jianghaiming authored Aug 16, 2021
  
  be24ea78
- Merge branch 'master' of https://git.yidian-inc.com:8021/bp/goods · 213a227a
  luhongguang authored Aug 16, 2021
  
  213a227a
- Merge branch 'jielong' into test · 2bb3fb8f
  luhongguang authored Aug 16, 2021
  
  2bb3fb8f
- update: 回调函数调整 · 02fb6fe5
  luhongguang authored Aug 16, 2021
  
  02fb6fe5
- update:SEt · d2279de7
  jianghaiming authored Aug 16, 2021
  
  d2279de7
- Merge branch 'fix_mengweifu_0816' into 'master' · 7ea606e1
  崔伟峰 authored Aug 16, 2021
```
fixed:take_place sort bug

See merge request bp/goods!7
```
  7ea606e1
- fixed:take_place sort bug · dbf19fd0
  mengweifu authored Aug 16, 2021
  
  dbf19fd0
- Merge branch 'jielong' into test · 81a5eb6b
  luhongguang authored Aug 16, 2021
  
  81a5eb6b
- update: tcc sql调整 · b80360db
  luhongguang authored Aug 16, 2021
  
  b80360db
- update: 线上测试用生活号id · 01ecb999
  luhongguang authored Aug 16, 2021
  
  01ecb999