Merge branch 'tkk' into test

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

@@ -23,6 +23,8 @@ public class TbMerchantThirdApply implements Serializable {
 
     private String smallAppid;
 
+    private String alipaySmallAppid;
+
     private String storeId;
 
 
@@ -117,4 +119,12 @@ public class TbMerchantThirdApply implements Serializable {
     public void setStoreId(String storeId) {
         this.storeId = storeId;
     }
+
+    public String getAlipaySmallAppid() {
+        return alipaySmallAppid;
+    }
+
+    public void setAlipaySmallAppid(String alipaySmallAppid) {
+        this.alipaySmallAppid = alipaySmallAppid;
+    }
 }