Merge branch 'master' into feature/junit_test

# Conflicts:
#	pom.xml
#	src/main/java/cn/quantgroup/xyqb/Bootstrap.java
#	src/main/resources/META-INF/app.properties
#	src/test/java/demo/MockMvcTests.java
#	src/test/java/demo/MvcTests.java
#	src/test/java/demo/ParametersJunit5Tests.java
#	src/test/java/demo/RepsitoryJpaTests.java
#	src/test/java/demo/RepsitoryTests.java
#	src/test/java/demo/ServiceTests.java
#	src/test/java/demo/WebTests.java
#	src/test/resources/META-INF/app.properties

src/main/java/cn/quantgroup/xyqb/controller/external/user/InnerController.java

@@ -118,8 +118,8 @@ public class InnerController implements IBaseController {
     return JsonResult.buildSuccessResult("", userRet);
   }
 
-  @RequestMapping("/userInfo/search/uuid")
   @LogHttpCaller
+  @RequestMapping("/userInfo/search/uuid")
   public JsonResult findUserInfoByUuid(@RequestParam(value = "uuid") String uuid) {
     LOGGER.info("需要查询的用户uuidid, uuid:" + uuid);
 
@@ -137,8 +137,9 @@ public class InnerController implements IBaseController {
     }
     return JsonResult.buildSuccessResult("", null);
   }
-  @RequestMapping("/userInfo/search/phone")
+
   @LogHttpCaller
+  @RequestMapping("/userInfo/search/phone")
   public JsonResult findUserInfoByPhone(@RequestParam(value = "phone") String phone) {
     LOGGER.info("需要查询的用户phone, phone:" + phone);
 

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserDetailServiceImpl.java

@@ -182,7 +182,8 @@ public class UserDetailServiceImpl implements IUserDetailService {
     return userDetailRepository.findAll(spec, pageRequest);
   }
 
-  @Override public void fixedIdNoAndGender() {
+  @Override
+  public void fixedIdNoAndGender() {
     List<UserDetail> details=userDetailRepository.selectUserDetailsBy();
     if(!CollectionUtils.isEmpty(details)){
       for (UserDetail detail:details){