diff --git a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/dto/CusBankImportDTO.java b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/dto/CusBankImportDTO.java index a7fcc3c..cc973b6 100644 --- a/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/dto/CusBankImportDTO.java +++ b/dl_admin/ruoyi-admin/src/main/java/com/ruoyi/cus/dto/CusBankImportDTO.java @@ -13,7 +13,7 @@ public class CusBankImportDTO { private String taxId; @Excel(name = "银行名称") private String bankName; - @Excel(name = "银行账户") + @Excel(name = "银行账号") private String bankAccount; @Excel(name = "分支机构代码") private String branchCode; diff --git a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseCountryMapper.xml b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseCountryMapper.xml index 9ade594..6cb3e44 100644 --- a/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseCountryMapper.xml +++ b/dl_admin/ruoyi-admin/src/main/resources/mapper/base/BaseCountryMapper.xml @@ -13,7 +13,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN base_time_zone btz ON main.zone_id = btz.id and name_en = #{entity.nameEn} - and name_cn = #{entity.nameCn} + and name_cn like concat('%', #{entity.nameCn}, '%') \ No newline at end of file diff --git a/dl_vue/src/views/cus/main/drawForm.vue b/dl_vue/src/views/cus/main/drawForm.vue index a98d30a..34fa352 100644 --- a/dl_vue/src/views/cus/main/drawForm.vue +++ b/dl_vue/src/views/cus/main/drawForm.vue @@ -57,12 +57,20 @@ - + @@ -71,10 +79,10 @@ @@ -255,6 +263,9 @@