Merge branch 'tkk' into test

2024-09-27 17:53:45 +08:00 · 2024-09-27 17:53:45 +08:00 · c24207bce4
parent 808e0a43bd 1add18e7dd
commit c24207bce4
1 changed files with 7 additions and 0 deletions
--- a/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyDto.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyDto.java
@ -16,6 +16,7 @@
 package cn.ysk.cashier.dto.shop;

 import lombok.Data;
+
 import java.io.Serializable;

 /**
@ -54,4 +55,10 @@ public class TbMerchantThirdApplyDto implements Serializable {

    /** shopId */
    private Integer shopId;
+
+    private String alipayAppId;
+
+    private String alipayAppToken;
+
+    private String alipaySmallAppid;
 }