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

优化

See merge request quanshu/mp-server!751

mp-common/src/main/java/com/qs/mp/common/enums/ChannelWithdrawStatusEnum.java

@@ -13,7 +13,7 @@ import com.qs.mp.common.json.EnumValueDeserializer;
 @JSONType(deserializer = EnumValueDeserializer.class)
 public enum ChannelWithdrawStatusEnum implements IEnum<Integer> {
 
-  WITHDRAWING(1, "提现中"),
+  WITHDRAWING(1, "待提现"),
   FINISHED(2, "已完成"),
   FAILED(3, "提现失败");
 

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

@@ -41,7 +41,7 @@ public class ChannelWithdrawExcel {
     private String level;
 
 
-    @Excel(name = "提现金额")
+    @Excel(name = "提现金额(元)")
     private BigDecimal money;