Commits · 0da7c92983f86a8ebb6d88d020ce199c294ce8f2 · bp / goods

17 Aug, 2021 5 commits
- 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
16 Aug, 2021 14 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
- update: 线上测试用生活号 · 65a3c3fa
  luhongguang authored Aug 16, 2021
  
  65a3c3fa
13 Aug, 2021 21 commits
- Merge branch 'jielong' into test · e2a3db60
  cuiweifeng authored Aug 13, 2021
  
  e2a3db60
- Merge branch 'jielong' of https://git.yidian-inc.com:8021/bp/goods into jielong · bff570d0
  cuiweifeng authored Aug 13, 2021
  
  bff570d0
- update tcc goods rollback fix · e2af1318
  cuiweifeng authored Aug 13, 2021
  
  e2af1318
- Merge branch 'jielong' into test · e926986f
  luhongguang authored Aug 13, 2021
  
  e926986f
- update: tcc 同一条数据取消时候问题 · 272c667e
  luhongguang authored Aug 13, 2021
  
  272c667e
- Merge branch 'jielong' into 'test' · f397a6a1
  孟维甫 authored Aug 13, 2021
```
fixed: original_price zero bug

See merge request bp/goods!6
```
  f397a6a1
- fixed: original_price zero bug · 1f5ca56c
  mengweifu authored Aug 13, 2021
  
  1f5ca56c
- Merge branch 'jielong' into test · 6c3db4c0
  cuiweifeng authored Aug 13, 2021
  
  6c3db4c0
- update : exception log · 5f6484ca
  cuiweifeng authored Aug 13, 2021
  
  5f6484ca
- Merge branch 'jielong' into test · 58608050
  jianghaiming authored Aug 13, 2021
  
  58608050
- updateS:Et · 3839843b
  jianghaiming authored Aug 13, 2021
  
  3839843b
- update:St · 8e00a754
  jianghaiming authored Aug 13, 2021
  
  8e00a754
- Merge branch 'jielong' into test · a9b64dde
  jianghaiming authored Aug 13, 2021
  
  a9b64dde
- Merge branch 'jielong' of https://gitlab.yidian-inc.com/bp/goods into jielong · 59d33f9f
  jianghaiming authored Aug 13, 2021
  
  59d33f9f
- update:et · 2f382e01
  jianghaiming authored Aug 13, 2021
  
  2f382e01
- Merge branch 'jielong' into 'test' · 253aa0f5
  孟维甫 authored Aug 13, 2021
```
Jielong

See merge request bp/goods!5
```
  253aa0f5
- Merge branch 'jielong' of https://git.yidian-inc.com:8021/bp/goods into jielong · bfa047eb
  mengweifu authored Aug 13, 2021
  
  bfa047eb
- fixed:goods = false bug · 47749d5a
  mengweifu authored Aug 13, 2021
  
  47749d5a
- Merge branch 'jielong' into test · 1cf94296
  cuiweifeng authored Aug 13, 2021
  
  1cf94296
- update : 修改文案 · 95267d0c
  cuiweifeng authored Aug 13, 2021
  
  95267d0c
- Merge branch 'jielong' into test · f7a369ad
  suntengda authored Aug 13, 2021
```
# Conflicts:
#	application/services/marketing/TakePlaceService.php
```
  f7a369ad