Merge branch 'master-xlk' into master-xlk-test

fhx

2024-08-23 1e65523fba19e99dbdf71d0a731a7747a2c9d4e0

 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;