Commits · aec1f5a75685eb1d909021e9d4f9d8f9fecf3b3c · yimu / mall-server

28 Dec, 2021 4 commits
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · aec1f5a7
  秦兴亮 authored Dec 28, 2021
  
  aec1f5a7
- bug修复 · b8a58c1a
  秦兴亮 authored Dec 28, 2021
  
  b8a58c1a
- copy发行 · 6d58cd2d
  wp authored Dec 28, 2021
  
  6d58cd2d
- 放开杭州接口 · 9a01504e
  wp authored Dec 28, 2021
  
  9a01504e
27 Dec, 2021 9 commits
- fix资产加商品coin · 3913d63a
  童得柱 authored Dec 27, 2021
  
  3913d63a
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 9ef1aa1c
  wlx@33.cn authored Dec 27, 2021
  
  9ef1aa1c
- 类目必填项校验去除 · bfda9001
  wlx@33.cn authored Dec 27, 2021
  
  bfda9001
- fix资产加商品coin · 48d81970
  童得柱 authored Dec 27, 2021
  
  48d81970
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · e922f0de
  秦兴亮 authored Dec 27, 2021
```
# Conflicts:
#	mall-server-front/src/main/java/com/fzm/mall/server/front/asset/model/UserAsset.java
#	mall-sql/mall_create.sql
```
  e922f0de
- 最新代码 · f1865d72
  秦兴亮 authored Dec 27, 2021
  
  f1865d72
- 修正退款 · fc983665
  wlx@33.cn authored Dec 27, 2021
  
  fc983665
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · c2fa5543
  wlx@33.cn authored Dec 27, 2021
  
  c2fa5543
- 同步状态 · 32a6cd1d
  wlx@33.cn authored Dec 27, 2021
  
  32a6cd1d
24 Dec, 2021 11 commits
- usu字段冲突 · ea496bd7
  wp authored Dec 24, 2021
  
  ea496bd7
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 94b8e051
  wp authored Dec 24, 2021
```
# Conflicts:
#	mall-server-admin/src/main/resources/mapper/goods_center/GoodsSkuUsufructMapper.xml
#	mall-sql/mall_create.sql
```
  94b8e051
- 拷贝逻辑修改 · b8308684
  wp authored Dec 24, 2021
  
  b8308684
- 修正sql · 63508ab1
  wlx@33.cn authored Dec 24, 2021
  
  63508ab1
- 修正nft获取tokenId · 7473734d
  wlx@33.cn authored Dec 24, 2021
  
  7473734d
- 修正sql · d47d0099
  wlx@33.cn authored Dec 24, 2021
  
  d47d0099
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 613dcc0d
  wlx@33.cn authored Dec 24, 2021
  
  613dcc0d
- copy nft修正 · 2789df0b
  wlx@33.cn authored Dec 24, 2021
  
  2789df0b
- 添加溯源hash，商品销量和发行量 · 6546af76
  童得柱 authored Dec 24, 2021
  
  6546af76
- 拷贝编号 · a9215cf4
  wp authored Dec 24, 2021
  
  a9215cf4
- 修正楼层脚本 · 16103378
  wlx@33.cn authored Dec 24, 2021
  
  16103378
23 Dec, 2021 13 commits
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 05b438be
  wlx@33.cn authored Dec 23, 2021
  
  05b438be
- 修正逻辑 · b86f34f0
  wlx@33.cn authored Dec 23, 2021
  
  b86f34f0
- 商品发布 · db60d826
  wp authored Dec 23, 2021
  
  db60d826
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · c171d927
  wp authored Dec 23, 2021
```
# Conflicts:
#	.gitignore
```
  c171d927
- 商品发布 · ff487019
  wp authored Dec 23, 2021
  
  ff487019
- 修正配置 · e4d36177
  wlx@33.cn authored Dec 23, 2021
  
  e4d36177
- 提交一幕支付配置 · 54e89735
  wlx@33.cn authored Dec 23, 2021
  
  54e89735
- 修正sql · 624a2df8
  wlx@33.cn authored Dec 23, 2021
  
  624a2df8
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 400a6a33
  wlx@33.cn authored Dec 23, 2021
  
  400a6a33
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · dc4b8106
  wlx@33.cn authored Dec 23, 2021
  
  dc4b8106
- 枚举类 · 689a45b9
  wp authored Dec 23, 2021
  
  689a45b9
- 提交 · 34c0af97
  wlx@33.cn authored Dec 23, 2021
  
  34c0af97
- 外部token发布商品 · b12482f9
  wp authored Dec 23, 2021
  
  b12482f9
22 Dec, 2021 3 commits
- 提货去掉走链 · 1deaa151
  wlx@33.cn authored Dec 22, 2021
  
  1deaa151
- 当前用户提货没有走链，提货的币并没有给商户，只是数据库冻结，用户提货单“确认收货”或“未收货”n天之后，因此不需要在退货时讲商品币由商家还给用户 · de328a09
  wlx@33.cn authored Dec 22, 2021
  
  de328a09
- 兼容使用权，退款，转赠，退货修正 · c049f4c2
  wlx@33.cn authored Dec 22, 2021
  
  c049f4c2