Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_c...

liujie

2025-12-12 17b8fad8bbf13dd6f6e2c1e300856c52dce4f3ee

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java

@@ -206,18 +206,22 @@
        for (MerchantImport merchantImport : merchantImports) {
            if (!StringUtils.hasLength(merchantImport.getMerchantName())){
                result.append("第"+i+"行：[", "商户名称"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(merchantImport.getMerchantPhone())){
                result.append("第"+i+"行：[", "商户电话"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(merchantImport.getTypeName())){
                result.append("第"+i+"行：[", "商户分类"+"]不能为空");
                i++;
                continue;
            }
            if (!StringUtils.hasLength(merchantImport.getAddress())){
                result.append("第"+i+"行：[", "商户地址"+"]不能为空");
                i++;
                continue;
            }
            TMerchantType merchantType = merchantTypeService.getOne(Wrappers.lambdaQuery(TMerchantType.class)
@@ -225,6 +229,7 @@
                    .last("LIMIT 1"));
            if(Objects.isNull(merchantType)){
                result.append("第"+i+"行：[", "商户分类"+"]不存在");
                i++;
                continue;
            }
            TMerchant merchant = new TMerchant();