Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

chenjiahe

2023-06-26 a7d770d976a4d421ca7594f6e99daf16c225d49c

Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeVo.java

@@ -19,6 +19,7 @@
@Data
public class EmployeeVo {

    private String id;
    private String unionId;

    private String userId;

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

@@ -71,4 +71,7 @@
    @PostMapping(value = "/emp/check/doctor")
    Result checkEmployeeRoleDoctor(@RequestBody(required = false) EmpDocDto employeeDto);

    @PostMapping(value = "/emp/detail/name")
    Result getDetailsByName(@RequestBody(required = false) EmpDocDto employeeDto);

}

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

@@ -44,4 +44,11 @@
     */
    @PostMapping(value = "/shop/detail/vo")
    Result getShopDetailVo(@RequestBody ShopDto shopDto);

    /**
     * 获取门店详情返回vo
     * @return Result
     */
    @PostMapping(value = "/shop/detail/name")
    Result getDetailByName(@RequestBody ShopDto shopDto);
}