Commits · 58e75822f371d59da253a87f38c7ae8478f767ae · 姚本章 / dm_project

04 Dec, 2020 11 commits
- ggg · 58e75822
  ysongq authored Dec 04, 2020
  
  58e75822
- commit · 9b9b4d30
  ysongq authored Dec 04, 2020
  
  9b9b4d30
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · 4f2273ad
  machengbo authored Dec 04, 2020
  
  4f2273ad
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · ca1aa927
  zhangc authored Dec 04, 2020
```
 Conflicts:
	jz-dm-mall/src/main/resources/mapperconf/MallCustomerDao.xml
```
  ca1aa927
- 提交接口代码 · b9f9f30f
  zhangc authored Dec 04, 2020
  
  b9f9f30f
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · 88a0be2c
  machengbo authored Dec 04, 2020
  
  88a0be2c
- 商城---收支情况统计列表---每天收支情况列表 · e6c4de2f
  machengbo authored Dec 04, 2020
  
  e6c4de2f
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · 9dabe269
  ysongq authored Dec 04, 2020
  
  9dabe269
- 注册/手机号码重复校验 · b3b082b7
  ysongq authored Dec 04, 2020
  
  b3b082b7
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · 5caeba35
  zhangc authored Dec 04, 2020
  
  5caeba35
- 添加商城+后台日志相关接口 · bf394c75
  zhangc authored Dec 04, 2020
  
  bf394c75
03 Dec, 2020 29 commits
- no message · 76a52875
  machengbo authored Dec 03, 2020
  
  76a52875
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · 5fac08e1
  machengbo authored Dec 03, 2020
  
  5fac08e1
- 提现充值 · d031ddbd
  machengbo authored Dec 03, 2020
  
  d031ddbd
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · d22a126f
  zhangc authored Dec 03, 2020
  
  d22a126f
- commit 添加日志想关接口 · 05951075
  zhangc authored Dec 03, 2020
  
  05951075
- commit · e44ed819
  ysongq authored Dec 03, 2020
  
  e44ed819
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · 80eaacfa
  ysongq authored Dec 03, 2020
  
  80eaacfa
- commit · 7f7bda24
  ysongq authored Dec 03, 2020
  
  7f7bda24
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · f3e14f54
  machengbo authored Dec 03, 2020
  
  f3e14f54
- no message · ba97f026
  machengbo authored Dec 03, 2020
  
  ba97f026
- commit · 998382ec
  machengbo authored Dec 03, 2020
  
  998382ec
- 添加公共异常处理类 · d13d83a6
  zhangc authored Dec 03, 2020
  
  d13d83a6
- Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · 37b205bb
  zhangc authored Dec 03, 2020
```
 Conflicts:
	jz-dm-mall/src/main/resources/application-test.yml
```
  37b205bb
- 修改gateway配置文件 · d89a6591
  zhangc authored Dec 03, 2020
  
  d89a6591
- Merge branch 'dm_dev' of http://gitlab.ioubuy.cn/yaobenzhang/dm_project into dm_dev · 4b65d01d
  ysongq authored Dec 03, 2020
  
  4b65d01d
- no message · e1db4b78
  ysongq authored Dec 03, 2020
  
  e1db4b78
- 商城模块 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