Merge branch 'master' into master-test

wangrenhuang

2023-10-23 85d1dc328bd46089b63b57bd356908cbba26e29c

 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);

}