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

优化

See merge request quanshu/mp-server!951

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

@@ -18,7 +18,7 @@ public class GoodsCardImportExcel {
     private String cardNo;
 
 
-    @Excel(name = "卡密")
+    @Excel(name = "密码(激活码)")
     private String cardPwd;
 
 }