• zhangc's avatar
    Merge branch 'dm_dev' of gitlab.ioubuy.cn:yaobenzhang/dm_project into dm_dev · 1b3e5085
    zhangc authored
     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
Name
Last commit
Last update
..
.settings Loading commit data...
src/main/java/com/jz/common Loading commit data...
.classpath Loading commit data...
.gitignore Loading commit data...
.project Loading commit data...
jz-dm-common.iml Loading commit data...
pom.xml Loading commit data...