aike/emis-oms2c-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'demand: OMS-单票下单优化：收货地区要根据目的国进行判断' (#3) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-oms2c-service/pulls/3
This commit is contained in:
heyu 2025-10-09 16:53:53 +08:00
commit 02f037d2ad
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-oms-biz-web/src/main/java/com/xdadan/erp/oms/web/Oms2cRegionController.java
View File

@ -52,10 +52,10 @@ public class Oms2cRegionController extends BaseController
}
// @PreAuthorize("@ss.hasPermi('emis:emisRegion:list')")
@JacksonFilter(include= {"id","regionCode","regionName","regionNameEn","parentCode"},value= EmisRegion.class,type= JacksonFilter.JscksonFilterType.RESPONSE)
@JacksonFilter(include = { "id", "regionCode", "regionName", "regionNameEn", "parentCode", "countryCode",
"countryName" }, value = EmisRegion.class, type = JacksonFilter.JscksonFilterType.RESPONSE)
@RequestMapping("/listSimple")
public TableDataInfo listSimple(EmisRegion emisRegion)
{
public TableDataInfo listSimple(EmisRegion emisRegion) {
if (emisRegion.getRegionType() == null) {
TableDataInfo rspData = new TableDataInfo();
rspData.setCode(500);