Merge remote-tracking branch 'origin/master'

mitao

3 天以前 f769d817f8ba2522147c73fa93ccacdc3aab0cb6

 ruoyi-system/src/main/java/com/ruoyi/system/export/AssetAdMaterialSporadicSettlementImport.java

@@ -63,10 +63,9 @@
    private BigDecimal unitPrice;

    @Excel(name = "金额（元）", width = 20)
    private BigDecimal totalAmount;
    private BigDecimal amount;

    @Excel(name = "备注", width = 20)
    private String remark;


}