From 938266e6cfbece0b2916b8e0611ea71167a09fe4 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 9 Oct 2025 10:57:57 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20OMS-=E5=8D=95=E7=A5=A8=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=E4=BC=98=E5=8C=96=EF=BC=9A=E6=94=B6=E8=B4=A7=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E8=A6=81=E6=A0=B9=E6=8D=AE=E7=9B=AE=E7=9A=84=E5=9B=BD?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../erp/oms/web/Oms2cRegionController.java       | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cRegionController.java b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cRegionController.java
index adb8411..2d719ef 100644
--- a/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cRegionController.java
+++ b/emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cRegionController.java
@@ -1,11 +1,11 @@
 
-/** 
+/**
   * @Project: emis
   * @Title: EmisRegionController.java
   * @author linfso
   * @date 2023-11-16 16:18:40
   * @Copyright: ShangHai Duta 2022 All rights reserved.
-  * @version v1.0  
+  * @version v1.0
   * @Description: <p> 四级省市区镇表 控制器 </p>
  */
 
@@ -29,7 +29,7 @@ import com.xdadan.erp.oms.service.IEmisRegionService;
 
 /**
  * 四级省市区镇表Controller
- * 
+ *
  * @author linfso
  * @date 2023-11-16 16:18:40
  */
@@ -51,12 +51,12 @@ public class Oms2cRegionController extends BaseController
         return getDataTable(list);
     }
 
-//    @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')")
-    @JacksonFilter(include= {"id","regionCode","regionName","regionNameEn","parentCode"},value= EmisRegion.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
+    // @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')")
+    @JacksonFilter(include = { "id", "regionCode", "regionName", "regionNameEn", "parentCode", "countryCode",
+            "countryName" }, value = EmisRegion.class, type = JacksonFilter.JscksonFilterType.RESPONSE)
     @RequestMapping("/listSimple")
-    public TableDataInfo listSimple(EmisRegion emisRegion)
-    {
-        if(emisRegion.getRegionType() == null){
+    public TableDataInfo listSimple(EmisRegion emisRegion) {
+        if (emisRegion.getRegionType() == null) {
             TableDataInfo rspData = new TableDataInfo();
             rspData.setCode(500);
             rspData.setMsg("参数错误,regionType必传");