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

fwq

2023-02-14 fe2387482b29c9b56c813cdd1b34eb29294ef9bb

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

 phis-feign/src/main/java/com/hz/his/dto/user/UserDto.java

@@ -7,8 +7,9 @@
/**查询用户详情数据*/
@Data
public class UserDto extends PageDto {

    /**标识*/
    private String id;
    /**用户标识*/
    private String userId;
    /**ciq*/
    private String CIQ;
@@ -20,4 +21,12 @@
    private String shopId;
    /**所属顾问名称*/
    private String beCorpUser;
    /**是否查询所属顾问信息:0否1是*/
    private Integer isSelectCorp;
    /**是否查询所属门店信息:0否1是*/
    private Integer isSelectShop;
    /**是否有门店*/
    private Integer isHaveShop;
    /**是否有顾问*/
    private Integer isHaveCorp;
}

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

@@ -5,6 +5,7 @@
import com.hz.his.dto.employee.EmpDocDto;
import com.hz.his.dto.TimeDto;
import com.hz.his.dto.employee.EmployeeDto;
import com.hz.his.dto.employee.EmployeeRoleDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -63,5 +64,8 @@
    @PostMapping(value = "/emp/role/liset")
    Result roleList(@RequestBody(required = false) EmployeeDto employeeDto);

    /**员工-角色列表*/
    @PostMapping(value = "/emp/role/info/list")
    Result employeeRoleList(@RequestBody(required = false) EmployeeRoleDto employeeRoleDto);

}