Merge remote-tracking branch 'origin/master'

liyuqian

2022-08-30 3bf095fd73adb103f96aa29943e33545495dff53

Merge remote-tracking branch 'origin/master'

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

@@ -10,7 +10,14 @@

    private String id;
    private String userId;
    /**ciq*/
    private String CIQ;
    /**名称*/
    private String name;
    /**手机号*/
    private String tel;
    /**所属门店标识*/
    private String shopId;
    /**所属顾问名称*/
    private String beCorpUser;
}

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

@@ -33,6 +33,12 @@
    Result userList(@RequestBody UserDto userDto);

    /**
     * 查询用户标识列表
     * */
    @PostMapping(value = "/user/list/ids")
    Result userIdList(@RequestBody UserDto userDto);

    /**
     * 获取到用户详情
     * @param userId 用户标识
     * @return 转化使用UserDt

 phis-feign/src/main/java/com/hz/phis/dt/user/UserDt.java

@@ -53,6 +53,8 @@
    private String userRole;
    /**用户类型*/
    private String userType;
    /*所属顾问(销售顾问)*/
    /**所属顾问(销售顾问)*/
    private String hisCorpUserId;
    /**所属顾问(销售顾问)*/
    private String hisCorpUser;
}