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

提现申请

See merge request quanshu/mp-server!183

mp-service/src/main/java/com/qs/mp/channel/domain/vo/ChannelMoneyLogVO.java

@@ -1,5 +1,7 @@
 package com.qs.mp.channel.domain.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.qs.mp.channel.domain.ChannelMoneyLog;
 import com.qs.mp.common.enums.ChannelWithdrawStatusEnum;
 import lombok.Data;
@@ -10,5 +12,6 @@ import lombok.Data;
  */
 @Data
 public class ChannelMoneyLogVO extends ChannelMoneyLog {
+  @JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
   private ChannelWithdrawStatusEnum withdrawStatus;
 }