Merge branch 'dev' of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web into dev

jsowell-pile/src/main/java/com/jsowell/pile/vo/base/MerchantInfoVO.java

@@ -5,6 +5,8 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -50,4 +52,14 @@ public class MerchantInfoVO {
 	 */
 	private String adapayMemberId;
 
+	/**
+	 * 提现类型(1-手动提现, 2-自动提现)
+	 */
+	private String withdrawalType;
+
+	/**
+	 * 预留金额
+	 */
+	private BigDecimal reservedAmount;
+
 }

jsowell-pile/src/main/java/com/jsowell/pile/vo/web/MerchantWithdrawalTypeVO.java

@@ -0,0 +1,32 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ * 运营商提现类型VO
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class MerchantWithdrawalTypeVO {
+    /**
+     * 运营商ID
+     */
+    private String merchantId;
+
+    /**
+     * 提现类型(1-手动提现, 2-自动提现)
+     */
+    private String withdrawalType;
+
+    /**
+     * 预留金额
+     */
+    private BigDecimal reservedAmount;
+}