Commit 3fd2951df13fddbd9f7ec891f37f5bda20a34c3e

Authored by Jiang
2 parents 74faa5a7 64d35ddf

Merge branch 'dev' of http://git3.nong12.com/b2c/gateway into dev

# Conflicts:
#	mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/UserService.java
#	mobsite-getway-service/src/main/java/com/diligrp/mobsite/getway/service/buyer/user/impl/UserServiceImpl.java
#	mobsite-getway-web/src/main/java/com/diligrp/mobsite/getway/web/api/buyer/user/UserController.java
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at