解决冲突

e9a19b1f · 查志伟 · fe0dd4a5 · e9a19b1f
Commit e9a19b1f authored Oct 28, 2021 by 查志伟
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

order-application-service/src/main/java/cn/freemud/entities/dto/pay/MultiQueryRespDto.java
+3 -3

No files found.
--- a/order-application-service/src/main/java/cn/freemud/entities/dto/pay/MultiQueryRespDto.java
+++ b/order-application-service/src/main/java/cn/freemud/entities/dto/pay/MultiQueryRespDto.java
@@ -14,10 +14,10 @@ public class MultiQueryRespDto {

    private String msg;

-    private Data data;
+    private ResponseDto data;

-    @lombok.Data
-    public class Data {
+    @Data
+    public class ResponseDto {

        public List<MultiPaymentRespDto> queryList;