Commits · 43b36bd1b541fd1495172f394ddd413a54af157a · yimu / mall-server

21 Mar, 2022 1 commit
- 修正前台超时关单 · 43b36bd1
  wlx@33.cn authored Mar 21, 2022
  
  43b36bd1
17 Mar, 2022 16 commits
- 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 3 commits
- Merge branch 'dev' into 'test' · 9d6c6175
  wulixian authored Mar 11, 2022
```
外部通证列表添加"溯源哈希"

See merge request !21
```
  9d6c6175
- Merge branch 'master' of https://gitlab.33.cn/yimu/mall-server into dev · 9e58d595
  wlx@33.cn authored Mar 11, 2022
  
  9e58d595
- 外部通证列表添加"溯源哈希" · b2b0364c
  wlx@33.cn authored Mar 11, 2022
  
  b2b0364c
10 Mar, 2022 3 commits
- Merge branch 'test' into 'master' · fb0a9ab7
  wulixian authored Mar 10, 2022
```
添加盲盒商品预热

See merge request !20
```
  fb0a9ab7
- Merge branch 'dev' into 'test' · 0311eff4
  wulixian authored Mar 10, 2022
```
添加盲盒商品预热

See merge request !19
```
  0311eff4
- 添加盲盒商品预热 · 867ee2ca
  wlx@33.cn authored Mar 10, 2022
  
  867ee2ca
09 Mar, 2022 15 commits
- Merge branch 'test' into 'master' · de2c130a
  wulixian authored Mar 09, 2022
```
商品价格同步到规格表

See merge request !17
```
  de2c130a
- Merge branch 'dev' into 'test' · 6fba3e2f
  wulixian authored Mar 09, 2022
```
Dev

See merge request !18
```
  6fba3e2f
- Merge branch 'master' of https://gitlab.33.cn/yimu/mall-server into dev · e6096e47
  wlx@33.cn authored Mar 09, 2022
  
  e6096e47
- Merge branch 'dev' into 'test' · 39571238
  wangpeng authored Mar 09, 2022
```
商品价格同步到规格表

See merge request !16
```
  39571238
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 4d85a72e
  wp authored Mar 09, 2022
  
  4d85a72e
- 商品价格同步到规格表 · dbe646f5
  wp authored Mar 09, 2022
  
  dbe646f5
- Merge branch 'test' into 'master' · 9b1fd7e4
  wulixian authored Mar 09, 2022
```
Test

See merge request !15
```
  9b1fd7e4
- Merge branch 'dev' into 'test' · 24d53c4f
  wulixian authored Mar 09, 2022
```
重试时间加长为20s

See merge request !14
```
  24d53c4f
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 5e3fa076
  wlx@33.cn authored Mar 09, 2022
  
  5e3fa076
- 重试时间加长为20s · af17aa9d
  wlx@33.cn authored Mar 09, 2022
  
  af17aa9d
- Merge branch 'dev' into 'test' · 2f1a8a3a
  wulixian authored Mar 09, 2022
```
转赠记录排序

See merge request !13
```
  2f1a8a3a
- 转赠添加排序 · 7ed265e5
  wlx@33.cn authored Mar 09, 2022
  
  7ed265e5
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 7fdbd64e
  wlx@33.cn authored Mar 09, 2022
  
  7fdbd64e
- 转赠记录排序 · 55c091d9
  wlx@33.cn authored Mar 09, 2022
  
  55c091d9
- Merge branch 'dev' into 'test' · b96d7cec
  wulixian authored Mar 09, 2022
```
修正转赠

See merge request !12
```
  b96d7cec