Merge branch 'master-base' into master-prod-new

chenjiahe

2024-07-25 37993b3cf3243e6ffdacab526b04dd2284565a42

 phis-feign/src/main/java/com/hz/his/dto/quotation/QuotationDto.java

@@ -33,7 +33,7 @@
    /** 总价(逻辑累计后填充，非传参使用) */
    private BigDecimal totalPrice;
    /** 报价项目-图片路径 */
    private String pImgUrl;
    private String bpImgUrl;

    /** 皮肤档案标识(MjSkinReport) */
    private String pfDaId;