Merge branch 'dev' into merge_adapay

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/ISettleOrderReportService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java

jsowell-pile/src/main/java/com/jsowell/pile/dto/GetClearingBillDTO.java

@@ -0,0 +1,29 @@
+package com.jsowell.pile.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 查询清分账单DTO
+ *
+ * @author Lemon
+ * @Date 2023/8/28 13:47
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class GetClearingBillDTO {
+
+    private Integer pageNum;
+
+    private Integer pageSize;
+
+    private String merchantId;
+
+    private String startTime;
+
+    private String endTime;
+}

jsowell-pile/src/main/java/com/jsowell/pile/dto/PayOrderDTO.java

@@ -1,5 +1,6 @@
 package com.jsowell.pile.dto;
 
+import com.jsowell.common.enums.ykc.ScenarioEnum;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -30,6 +31,12 @@ public class PayOrderDTO {
 	 */
 	private BigDecimal payAmount;
 
+	/**
+	 * @see ScenarioEnum
+	 * 支付场景
+	 */
+	private String type;
+
 	/**
 	 * 微信支付需要用的code
 	 */

jsowell-pile/src/main/java/com/jsowell/pile/dto/SettleOrderReportDTO.java

@@ -11,6 +11,11 @@ public class SettleOrderReportDTO {
      */
     private String stationId;
 
+    /**
+     * 运营商id
+     */
+    private String merchantId;
+
     /**
      * 交易日期
      */