Commits · 0b863b26818b862910e5369f504542823b01ea90 · yimu / mall-server

30 Dec, 2021 3 commits
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 0b863b26
  秦兴亮 authored Dec 30, 2021
  
  0b863b26
- 短信模板修改 · c2dc27ef
  秦兴亮 authored Dec 30, 2021
  
  c2dc27ef
- 短信模板切换 · f9c3d3b6
  wp authored Dec 30, 2021
  
  f9c3d3b6
29 Dec, 2021 11 commits
- goodscoin查资产 · 3a04e478
  童得柱 authored Dec 29, 2021
  
  3a04e478
- Merge remote-tracking branch 'origin/dev' into dev · 120b3f6d
  童得柱 authored Dec 29, 2021
  
  120b3f6d
- 最新代码 · 32c8e97f
  秦兴亮 authored Dec 29, 2021
  
  32c8e97f
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 9cf5b8b8
  秦兴亮 authored Dec 29, 2021
  
  9cf5b8b8
- bug修复 · 01567e9d
  秦兴亮 authored Dec 29, 2021
  
  01567e9d
- 修正转赠 · 3f86abba
  wlx@33.cn authored Dec 29, 2021
  
  3f86abba
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · 81981157
  wlx@33.cn authored Dec 29, 2021
  
  81981157
- 优化转赠 · 88cc1592
  wlx@33.cn authored Dec 29, 2021
  
  88cc1592
- 资产排序 · 609d3b3a
  童得柱 authored Dec 29, 2021
  
  609d3b3a
- fix · f6cd48bb
  童得柱 authored Dec 29, 2021
  
  f6cd48bb
- fix · f48bc076
  童得柱 authored Dec 29, 2021
  
  f48bc076
28 Dec, 2021 15 commits
- 币名修改 · a656b965
  秦兴亮 authored Dec 28, 2021
  
  a656b965
- 方法调整 · 6e6c328b
  秦兴亮 authored Dec 28, 2021
  
  6e6c328b
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · cd124985
  秦兴亮 authored Dec 28, 2021
  
  cd124985
- 最新代码 · 77004fe0
  秦兴亮 authored Dec 28, 2021
  
  77004fe0
- Merge branch 'dev' of https://gitlab.33.cn/yimu/mall-server into dev · ef38da45
  wlx@33.cn authored Dec 28, 2021
  
  ef38da45
- 修正copy商品链上交易 · 0b3e3f7c
  wlx@33.cn authored Dec 28, 2021
  
  0b3e3f7c
- fix · 704469c7
  童得柱 authored Dec 28, 2021
  
  704469c7
- 溯源hash同步 · 65b4c5b4
  wp authored Dec 28, 2021
  
  65b4c5b4
- 修改 · 63be8cac
  秦兴亮 authored Dec 28, 2021
  
  63be8cac
- bug修复 · 33e6ae51
  秦兴亮 authored Dec 28, 2021
  
  33e6ae51
- bug修复 · 67d8e379
  秦兴亮 authored Dec 28, 2021
  
  67d8e379
- 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 2 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