Commits · test · yimu / mall-server

01 Apr, 2022 3 commits
- Merge branch 'dev' into 'test' · 258cbdab
  wulixian authored Apr 01, 2022
```
修正促销活动和优惠券兼容盲盒

See merge request !56
```
  258cbdab
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · d3870aa0
  wlx@33.cn authored Apr 01, 2022
  
  d3870aa0
- 优惠券和促销活动兼容盲盒 · c9f53b14
  wlx@33.cn authored Apr 01, 2022
  
  c9f53b14
31 Mar, 2022 3 commits
- Merge branch 'dev' into 'test' · 8f52ffe7
  wulixian authored Mar 31, 2022
```
修正盲盒销售类型

See merge request !55
```
  8f52ffe7
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 52bc6456
  wlx@33.cn authored Mar 31, 2022
  
  52bc6456
- 修正盲盒销售类型 · 7e289819
  wlx@33.cn authored Mar 31, 2022
  
  7e289819
25 Mar, 2022 10 commits
- Merge branch 'dev' into 'test' · ea147855
  wulixian authored Mar 25, 2022
```
修改楼层排序

See merge request !53
```
  ea147855
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 15ae50bb
  wlx@33.cn authored Mar 25, 2022
  
  15ae50bb
- 修改楼层排序 · 8320de71
  wlx@33.cn authored Mar 25, 2022
  
  8320de71
- Merge branch 'dev' into 'test' · 18a30ad8
  wulixian authored Mar 25, 2022
```
增加服务器时间查询接口

See merge request !52
```
  18a30ad8
- Merge branch 'master' of https://gitlab.33.cn/yimu/mall-server into dev · 74976a14
  wlx@33.cn authored Mar 25, 2022
  
  74976a14
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 24fbb65a
  wlx@33.cn authored Mar 25, 2022
  
  24fbb65a
- 增加服务器时间查询接口 · c7ae4bb8
  wlx@33.cn authored Mar 25, 2022
  
  c7ae4bb8
- Merge branch 'test' into 'master' · c79d8add
  wulixian authored Mar 25, 2022
```
bannner添加商品时，查询结果添加商品类型和销售类型

See merge request !51
```
  c79d8add
- Merge branch 'dev' into 'test' · 69e2db26
  wulixian authored Mar 25, 2022
```
bannner添加商品时，查询结果添加商品类型和销售类型

See merge request !50
```
  69e2db26
- bannner添加商品时，查询结果添加商品类型和销售类型 · 69fc0ffc
  wlx@33.cn authored Mar 25, 2022
  
  69fc0ffc
24 Mar, 2022 4 commits
- Merge branch 'test' into 'master' · 2d6449c0
  wangpeng authored Mar 24, 2022
```
Test

See merge request !48
```
  2d6449c0
- Merge branch 'dev' into 'test' · c0e890fa
  wangpeng authored Mar 24, 2022
```
Dev

See merge request !46
```
  c0e890fa
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · 67b60dc8
  wp authored Mar 24, 2022
  
  67b60dc8
- 一幕影链测试IP屏蔽 · 65e721ec
  wp authored Mar 24, 2022
  
  65e721ec
22 Mar, 2022 4 commits
- Merge branch 'dev' into 'test' · bfb43441
  wangpeng authored Mar 22, 2022
```
修改盲盒规格默认值

See merge request !45
```
  bfb43441
- 修改盲盒规格默认值 · 8f2cd0ad
  wp authored Mar 22, 2022
  
  8f2cd0ad
- Merge branch 'dev' into 'test' · 62bf2968
  wangpeng authored Mar 22, 2022
```
取消审核权限放开

See merge request !44
```
  62bf2968
- 取消审核权限放开 · 133840c0
  wp authored Mar 22, 2022
  
  133840c0
21 Mar, 2022 11 commits
- Merge branch 'dev' into 'test' · 530b4953
  wangpeng authored Mar 21, 2022
```
修改数组转字符串方法

See merge request !43
```
  530b4953
- 修改数组转字符串方法 · 9298e1f0
  wp authored Mar 21, 2022
  
  9298e1f0
- Merge branch 'dev' into 'test' · bb76ed11
  wangpeng authored Mar 21, 2022
```
取消审核没有权限修复

See merge request !42
```
  bb76ed11
- 取消审核没有权限修复 · ba8c0247
  wp authored Mar 21, 2022
  
  ba8c0247
- Merge branch 'dev' into 'test' · 9cc56e79
  wulixian authored Mar 21, 2022
```
修正关单

See merge request !41
```
  9cc56e79
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 00899937
  wlx@33.cn authored Mar 21, 2022
  
  00899937
- 修正关单 · 874e9125
  wlx@33.cn authored Mar 21, 2022
  
  874e9125
- Merge branch 'dev' into 'test' · 09d92955
  wulixian authored Mar 21, 2022
```
修正前台超时关单

See merge request !40
```
  09d92955
- Merge branch 'test' of https://gitlab.33.cn/yimu/mall-server into dev · ec14829d
  wlx@33.cn authored Mar 21, 2022
  
  ec14829d
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · be844cab
  wlx@33.cn authored Mar 21, 2022
  
  be844cab
- 修正前台超时关单 · 43b36bd1
  wlx@33.cn authored Mar 21, 2022
  
  43b36bd1
18 Mar, 2022 5 commits
- Merge branch 'dev' into 'test' · de3fe690
  wangpeng authored Mar 18, 2022
```
Dev

See merge request !39
```
  de3fe690
- 拷贝发行优化 · 6009804f
  wp authored Mar 18, 2022
  
  6009804f
- 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