Merge branch 'master-prod-new' into master-test

Andru

2023-11-20 95dd7d30c396ddc175a794db43216f995c067e5d

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SProjectService.java

@@ -106,6 +106,6 @@
     * @return
     */
    @PostMapping(value = "/project/list/by/type")
    List<Map<String, Object>> getProjectByTypeId(@RequestBody ProjectDto projectDto);
    Result  getProjectByTypeId(@RequestBody ProjectDto projectDto);

}