Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/resources/application.yml

src/main/java/com/ycwl/basic/controller/mobile/AppFaceController.java

@@ -17,7 +17,8 @@ import org.springframework.web.multipart.MultipartFile;
 @RestController
 @RequestMapping("/api/mobile/face/v1")
 @Api(tags = "用户人脸相关接口")
-public class AppFaceController {
+public class
+AppFaceController {
 
     @Autowired
     private FaceService faceService;