Merge remote-tracking branch 'origin/dev' into dev

ruoyi-warehouse/src/main/java/com/ruoyi/finance/domain/excel/ProfitGeneralLedgerExcel.java

@@ -15,13 +15,13 @@ public class ProfitGeneralLedgerExcel implements Serializable {
     @Excel(name = "年月")
     private String reviewDate;
 
-    @Excel(name = "应付金额")
+    @Excel(name = "应收金额")
     private Double fAmount;
 
-    @Excel(name = "实付金额")
+    @Excel(name = "应付金额")
     private Double fStlamount;
 
-    @Excel(name = "未付金额")
+    @Excel(name = "利润")
     private Double nnfinished;
 
 }