Merge branch 'master' into master-test

wangrenhuang

2023-06-25 b4707c89691166e9febc0e3321c0ecea6d5c30f3

 phis-feign/src/main/java/com/hz/his/dto/report/ConsultantCashReportDto.java

@@ -50,4 +50,10 @@
    private String hisCorpUserName;
    //用户咨询师（荣爷说权限按照这个查询）
    private String hisCorpUserId;
    //登录员工标识
    private String loginEmpId;
    /** 操作人标识 */
    private String operatorId;
    /** 操作人 */
    private String operatorName;
}