三方配置增加字段

eladmin-common/src/main/java/cn/ysk/cashier/utils/ListUtil.java

@@ -94,7 +94,9 @@ public class ListUtil {
         // method1 创建一个Integer类型的集合，循环遍历String类型的数组并把数据添加进集合
         List<Integer> integerList = new ArrayList<>();
         for (String s : listString) {
-            integerList.add(Integer.parseInt(s));
+            if (!StringUtils.isEmpty(s)) {
+                integerList.add(Integer.parseInt(s));
+            }
         }
         return integerList;
     }

eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbMerchantThirdApplyController.java

@@ -15,21 +15,22 @@
 */
 package cn.ysk.cashier.controller.shop;
 
-import cn.ysk.cashier.annotation.Log;
-import cn.ysk.cashier.pojo.shop.TbMerchantThirdApply;
-import cn.ysk.cashier.service.shop.TbMerchantThirdApplyService;
 import cn.ysk.cashier.dto.shop.TbMerchantThirdApplyDto;
 import cn.ysk.cashier.dto.shop.TbMerchantThirdApplyQueryCriteria;
-import org.springframework.data.domain.Pageable;
+import cn.ysk.cashier.pojo.shop.TbMerchantThirdApply;
+import cn.ysk.cashier.service.shop.TbMerchantThirdApplyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import io.swagger.annotations.*;
-import java.io.IOException;
+
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 /**
 * @website https://eladmin.vip

eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbMerchantThirdApplyDto.java

@@ -32,6 +32,10 @@ public class TbMerchantThirdApplyDto implements Serializable {
 
     private String type ="";
 
+    private String smallAppid="";
+
+    private String storeId="";
+
     /** 商户应用 */
     private String appId="";
 

eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbMerchantThirdApply.java

@@ -46,6 +46,14 @@ public class TbMerchantThirdApply implements Serializable {
     @ApiModelProperty(value = "商户应用")
     private String appId;
 
+    @Column(name = "`small_appid`")
+    @ApiModelProperty(value = "小程序appid")
+    private String smallAppid;
+
+    @Column(name = "`store_id`")
+    @ApiModelProperty(value = "店铺id")
+    private String storeId;
+
     @Column(name = "`app_token`")
     @ApiModelProperty(value = "商户token")
     private String appToken;