Commits · 18b339bb968982a6857377548dcb70f0dc1441c8 · yimu / mall-server

18 Mar, 2022 6 commits
- Merge branch 'master' of https://gitlab.33.cn/yimu/mall-server into dev · 18b339bb
  wp authored Mar 18, 2022
  
  18b339bb
- Merge branch 'dev' into 'test' · 7ad712ae
  wangpeng authored Mar 18, 2022
```
Dev

See merge request !37
```
  7ad712ae
- 优化 · 3501adb7
  wp authored Mar 18, 2022
  
  3501adb7
- 库存优化 · f82c52bd
  wp authored Mar 18, 2022
  
  f82c52bd
- Merge branch 'dev' into 'test' · 744cc9fb
  wangpeng authored Mar 18, 2022
```
预热定时任务

See merge request !36
```
  744cc9fb
- 预热定时任务 · 8c28cfd2
  wp authored Mar 18, 2022
  
  8c28cfd2
17 Mar, 2022 31 commits
- Merge branch 'dev' into 'test' · d0a27a16
  wangpeng authored Mar 17, 2022
```
Dev

See merge request !34
```
  d0a27a16
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 0cad3b46
  wp authored Mar 17, 2022
  
  0cad3b46
- 优化 · 05f77617
  wp authored Mar 17, 2022
  
  05f77617
- Merge branch 'dev' into 'test' · 258e5e44
  wangpeng authored Mar 17, 2022
```
优化

See merge request !33
```
  258e5e44
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 05344c5a
  wp authored Mar 17, 2022
  
  05344c5a
- 优化 · 34a7ad1b
  wp authored Mar 17, 2022
  
  34a7ad1b
- Merge branch 'dev' into 'test' · a732c79e
  wangpeng authored Mar 17, 2022
```
外部通证优化

See merge request !32
```
  a732c79e
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 47b734dc
  wp authored Mar 17, 2022
  
  47b734dc
- 外部通证优化 · 772a6708
  wp authored Mar 17, 2022
  
  772a6708
- Merge branch 'dev' into 'test' · 92080742
  wangpeng authored Mar 17, 2022
```
外部通证发布商品优化

See merge request !31
```
  92080742
- 外部通证发布商品优化 · c2d0acc4
  wp authored Mar 17, 2022
  
  c2d0acc4
- Merge branch 'dev' into 'test' · 555ac493
  wangpeng authored Mar 17, 2022
```
外部发布商品优化

See merge request !30
```
  555ac493
- 外部发布商品优化 · 283299e8
  wp authored Mar 17, 2022
  
  283299e8
- Merge branch 'test' into 'master' · cc8c8199
  wulixian authored Mar 17, 2022
```
楼层商品添加预热

See merge request !29
```
  cc8c8199
- Merge branch 'dev' into 'test' · ce71993a
  wulixian authored Mar 17, 2022
```
楼层商品添加预热

See merge request !28
```
  ce71993a
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 512675cd
  wlx@33.cn authored Mar 17, 2022
  
  512675cd
- 楼层商品添加预热 · 9f5ba209
  wlx@33.cn authored Mar 17, 2022
  
  9f5ba209
- Merge branch 'dev' into 'test' · 60bfddab
  wulixian authored Mar 17, 2022
```
楼层添加预售商品

See merge request !27
```
  60bfddab
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 03bd8e2a
  wlx@33.cn authored Mar 17, 2022
  
  03bd8e2a
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · d9a1c2f1
  wlx@33.cn authored Mar 17, 2022
  
  d9a1c2f1
- 楼层添加预售商品 · af00c307
  wlx@33.cn authored Mar 17, 2022
  
  af00c307
- Merge branch 'dev' into 'test' · fc0c00e4
  wangpeng authored Mar 17, 2022
```
Dev

See merge request !25
```
  fc0c00e4
- 分页查询结果增加预热结束时间展示 · 480f3ccb
  wp authored Mar 17, 2022
  
  480f3ccb
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 57fea269
  wp authored Mar 17, 2022
  
  57fea269
- Merge branch 'master' of https://gitlab.33.cn/yimu/mall-server into dev · db3e6614
  wlx@33.cn authored Mar 17, 2022
  
  db3e6614
- Merge branch 'fix-0317' into 'master' · e93d4b9b
  wulixian authored Mar 17, 2022
```
盲盒下单添加事物

See merge request !24
```
  e93d4b9b
- 盲盒下单添加事物 · ef5214a3
  wlx@33.cn authored Mar 17, 2022
  
  ef5214a3
- Merge branch 'dev' into 'test' · b7496a3c
  wulixian authored Mar 17, 2022
```
盲盒下单补增事务

See merge request !23
```
  b7496a3c
- 盲盒下单补增事务 · bb4b950d
  wlx@33.cn authored Mar 17, 2022
  
  bb4b950d
- Merge branch 'dev' into 'test' · ebda14d9
  wangpeng authored Mar 17, 2022
```
Dev

See merge request !22
```
  ebda14d9
- 一幕管理后台新增预热功能 · 9ccc4133
  wp authored Mar 17, 2022
  
  9ccc4133
15 Mar, 2022 2 commits
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 4a57d9fd
  wlx@33.cn authored Mar 15, 2022
  
  4a57d9fd
- 添加预热开始时间和结束时间 · ba9e65c4
  wlx@33.cn authored Mar 15, 2022
  
  ba9e65c4
11 Mar, 2022 1 commit
- Merge branch 'dev' into 'test' · 9d6c6175
  wulixian authored Mar 11, 2022
```
外部通证列表添加"溯源哈希"

See merge request !21
```
  9d6c6175