Merge branch 'adapay' into dev

# Conflicts:
#	jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java

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

@@ -0,0 +1,27 @@
+package com.jsowell.pile.vo.web;
+
+import lombok.*;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class BalanceDeductionAmountVO {
+    /**
+     * 会员id
+     */
+    private String memberId;
+
+    /**
+     * 支付id
+     */
+    private String paymentId;
+
+    /**
+     * 扣除金额
+     */
+    private BigDecimal deductionAmount;
+}