• liqin's avatar
    Merge branch 'master' of http://111.203.232.171:8888/licc/shop-mall into master · 466add35
    liqin authored
     Conflicts:
    	wisenergy-service/src/main/java/cn/wisenergy/service/app/UserService.java
    	wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UserServiceImpl.java
    	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/UserController.java
    	wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/loginController.java
    466add35
Name
Last commit
Last update
..
src/main/java/cn/wisenergy/service Loading commit data...
.gitignore Loading commit data...
pom.xml Loading commit data...
wisenergy-service.iml Loading commit data...