Commits · ba97f0269ca9f99d0d6300906f2a70840624e6a5 · 姚本章 / dm_project

03 Dec, 2020 22 commits
- no message · ba97f026
  machengbo authored Dec 03, 2020
  
  ba97f026
- commit · 998382ec
  machengbo authored Dec 03, 2020
  
  998382ec
- 商城模块 mybatis-plus 的配置 · 5df3f0c7
  machengbo authored Dec 03, 2020
  
  5df3f0c7
- commit · 3dbf6660
  zhangc authored Dec 03, 2020
  
  3dbf6660
- commit · 65da047d
  zhangc authored Dec 03, 2020
  
  65da047d
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · 1b3e5085
  zhangc authored Dec 03, 2020
```
 Conflicts:
	jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/customer/LoginController.java
	jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/customer/ValidateCodeController.java
	jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/service/MallCustomerService.java
	pom.xml
```
  1b3e5085
- 修复启动异常 · 00fbc440
  zhangc authored Dec 03, 2020
  
  00fbc440
- $DESKTOP-5KITOLR\Administrator's avatar$
  
  commit · 1539dd84
  DESKTOP-5KITOLR\Administrator authored Dec 03, 2020
  
  1539dd84
- commit · fc6e1d4e
  machengbo authored Dec 03, 2020
  
  fc6e1d4e
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · faeff6ae
  machengbo authored Dec 03, 2020
```
# Conflicts:
#	jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/controller/finance/FinanceTradeFlowController.java
```
  faeff6ae
- commit · 8684ae6f
  ysongq authored Dec 03, 2020
  
  8684ae6f
- commit 实体类 · 9bac04e6
  ysongq authored Dec 03, 2020
  
  9bac04e6
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · 61f1154b
  zhangc authored Dec 03, 2020
```
 Conflicts:
	jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/mapper/FinanceCustomerAssetsDao.java
	pom.xml
```
  61f1154b
- commit 统一包路径 · a054d092
  zhangc authored Dec 03, 2020
  
  a054d092
- no message · 8f3dc1f4
  machengbo authored Dec 03, 2020
  
  8f3dc1f4
- commit · 297a626b
  ysongq authored Dec 03, 2020
  
  297a626b
- no message · 83cc0822
  ysongq authored Dec 03, 2020
  
  83cc0822
- no message · de3dd5d7
  ysongq authored Dec 03, 2020
  
  de3dd5d7
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · 6d90857e
  zhangc authored Dec 03, 2020
```
 Conflicts:
	jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/mapper/MallCustomerDao.java
```
  6d90857e
- commit · f0396d33
  zhangc authored Dec 03, 2020
  
  f0396d33
- commit 实体 · 035c4ada
  zhangc authored Dec 03, 2020
  
  035c4ada
- no message · b153b3ad
  machengbo authored Dec 03, 2020
  
  b153b3ad
02 Dec, 2020 18 commits
- no message · afb80bab
  machengbo authored Dec 02, 2020
  
  afb80bab
- 商城用户利润中心类添加 · e3c8fcdd
  machengbo authored Dec 02, 2020
  
  e3c8fcdd
- 订单详情和接口文档 · 99df1c25
  machengbo authored Dec 02, 2020
  
  99df1c25
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · e0c98ce6
  zhangc authored Dec 02, 2020
```
 Conflicts:
	jz-dm-common/pom.xml
	jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/mapper/MallCustomerDao.java
```
  e0c98ce6
- 添加企业认证接口 · c5df897f
  zhangc authored Dec 02, 2020
  
  c5df897f
- no message · a5de1461
  ysongq authored Dec 02, 2020
  
  a5de1461
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · 7c6d61b0
  zhangc authored Dec 02, 2020
  
  7c6d61b0
- commit · a9ebb74d
  zhangc authored Dec 02, 2020
  
  a9ebb74d
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · 85e41fe9
  ysongq authored Dec 02, 2020
  
  85e41fe9
- 商城/平台登录 · 7d84f2ac
  ysongq authored Dec 02, 2020
  
  7d84f2ac
- commit Test类 · 934852f2
  zhangc authored Dec 02, 2020
  
  934852f2
- commit api网关代码 · 8510edc7
  zhangc authored Dec 02, 2020
  
  8510edc7
- 修改mybatisplus配置 · 6c1fa2e9
  ysongq authored Dec 02, 2020
  
  6c1fa2e9
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · 1ea71617
  machengbo authored Dec 02, 2020
  
  1ea71617
- 把金额类型改为bigdecimal · 4c552a39
  machengbo authored Dec 02, 2020
  
  4c552a39
- commit实体，xml · b56526e3
  zhangc authored Dec 02, 2020
  
  b56526e3
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · 72eb7018
  zhangc authored Dec 02, 2020
  
  72eb7018
- 提交apigateway代码 · e7e3ddfa
  zhangc authored Dec 02, 2020
  
  e7e3ddfa