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

chenjiahe

2023-08-07 9fd5c6f5473e692b2f15d182d07bb5cf278f57a5

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

@@ -11,12 +11,12 @@
@Data
public class ClinicPerfReqDto extends BaseQueryVo{

    /** 门店id */
    /** 所属门店id */
    private String shopId;
    /** 收银门店 */
    /** 订单门店 */
    private String orderShopId;
    /** 收银门店*/
    private String cashierShopId;
    /** 所属门店*/
    private String userShopId;
    /** 开始时间 */
    private String startTime;
    /** 结束时间 */