Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

buhuazhen

2 天以前 392366ea36a839e5d0ea05968e6da31cd53a9ee6

 main-business/src/main/java/com/ruoyi/business/vo/SalesRecordExportVo.java

@@ -76,10 +76,15 @@
    @Excel(name = "净利润")
    private BigDecimal netProfit;
    /**
     * 运费
     * 采购运费
     */
    @Excel(name = "运费")
    private BigDecimal freight;
    @Excel(name = "采购运费")
    private BigDecimal purchasingFreight;
    /**
     * 销售运费
     */
    @Excel(name = "销售运费")
    private BigDecimal salesFreight;
    /**
     * 登记人
     */