Merge remote-tracking branch 'origin/master-test' into master-test

fwq

2024-05-13 f52dc5114638600e934cc82fe63c4a25f22594cc

 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;