Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!606

mp-service/src/main/java/com/qs/mp/admin/domain/excel/PrizeRecoveryExcel.java

@@ -23,20 +23,20 @@ public class PrizeRecoveryExcel {
     @Excel(name = "商品名称")
     private String title;
 
-    @Excel(name = "商品sku")
+    @Excel(name = "商品规格")
     private String properties;
 
     @Excel(name = "商品单价(盲豆)")
     private Integer exchangePrice;
 
-    @Excel(name = "数量")
+    @Excel(name = "回收数量")
     private Integer num;
 
     @Excel(name = "回收折扣(%)")
     private BigDecimal discountRate;
 
     @Excel(name = "返还盲豆数")
-    private Integer refundCoin;
+    private Integer returnCoin;
 
     @Excel(name = "用户昵称")
     private String nickName;