Merge remote-tracking branch 'origin/test' into test

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbMerchantThirdApply.java

@@ -8,7 +8,6 @@ public class TbMerchantThirdApply implements Serializable {
     private String type;
 
     private String appId;
-    private String alipayAppId;
 
     private Byte status;
 
@@ -21,7 +20,6 @@ public class TbMerchantThirdApply implements Serializable {
     private Long updatedAt;
 
     private String appToken;
-    private String alipayAppToken;
 
     private String smallAppid;
 
@@ -129,20 +127,4 @@ public class TbMerchantThirdApply implements Serializable {
     public void setAlipaySmallAppid(String alipaySmallAppid) {
         this.alipaySmallAppid = alipaySmallAppid;
     }
-
-    public String getAlipayAppId() {
-        return alipayAppId;
-    }
-
-    public void setAlipayAppId(String alipayAppId) {
-        this.alipayAppId = alipayAppId;
-    }
-
-    public String getAlipayAppToken() {
-        return alipayAppToken;
-    }
-
-    public void setAlipayAppToken(String alipayAppToken) {
-        this.alipayAppToken = alipayAppToken;
-    }
 }