Merge branch 'master' into master-test

wangrenhuang

2023-07-16 3de90089345a2bb8c18114885a8d7dcd58a432ce

 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;
    /** 结束时间 */