Merge remote-tracking branch 'origin/dev_optimize' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -544,7 +544,7 @@ public class IcResiUserController implements ResultDataResolver {
      * @param tokenDto
      * @return 根据分类搜索
      */
-    @PostMapping("search")
+    @PostMapping("searchbycategory")
     public Result<PageData<SearchByNameResultDTO>> search(@RequestBody SearchByNameFormDTO formDTO, @LoginUser TokenDto tokenDto) {
         formDTO.setCustomerId(tokenDto.getCustomerId());
         formDTO.setUserId(tokenDto.getUserId());