Merge branch 'release-fix' into release

yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/controller/app/region/AppRegionController.java

@@ -40,7 +40,6 @@ public class AppRegionController {
     @GetMapping("/get")
     @ApiOperation("获得区域设置")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
-    @PreAuthorize("@ss.hasPermission('ecw:region:query')")
     public CommonResult<RegionRespVO> getRegion(@RequestParam("id") Long id) {
         RegionDO region = regionService.getRegion(id);
         return success(RegionConvert.INSTANCE.convert(region));
@@ -50,7 +49,7 @@ public class AppRegionController {
 
     @GetMapping("/list")
     @ApiOperation("获得区域设置列表")
-    @PreAuthenticated
+//    @PreAuthenticated
     public CommonResult<List<RegionRespVO>> getRegionList(RegionListReqVO reqVO) {
         List<RegionDO> list = regionService.getSimpleDepts(reqVO);
         list.sort(Comparator.comparing(RegionDO::getSort));
@@ -59,7 +58,7 @@ public class AppRegionController {
 
     @GetMapping("/page")
     @ApiOperation("获得区域设置分页")
-    @PreAuthenticated
+//    @PreAuthenticated
     public CommonResult<PageResult<RegionRespVO>> getRegionPage(@Valid RegionPageReqVO pageVO) {
         PageResult<RegionDO> pageResult = regionService.getRegionPage(pageVO);
         return success(RegionConvert.INSTANCE.convertPage(pageResult));
@@ -68,7 +67,7 @@ public class AppRegionController {
     @GetMapping("/getTree")
     @ApiOperation("获得区域子列表")
     @ApiImplicitParam(name = "id", value = "编号", required = true, example = "1024", dataTypeClass = Long.class)
-    @PreAuthenticated
+//    @PreAuthenticated
     public CommonResult<RegionRespVO> getTree(@RequestParam("id") Long id) {
         List<RegionDO> list = regionService.getByParent(id);
         List<RegionRespVO> dataList = RegionConvert.INSTANCE.convertList(list);
@@ -83,7 +82,7 @@ public class AppRegionController {
 
     @GetMapping("/getListTree")
     @ApiOperation("获得区域设置列表")
-    @PreAuthenticated
+//    @PreAuthenticated
     public CommonResult<List<RegionRespVO>> listTree(RegionListReqVO reqVO) {
         List<RegionDO> list = regionService.getSimpleDepts(reqVO);
         list.sort(Comparator.comparing(RegionDO::getSort));
@@ -108,7 +107,7 @@ public class AppRegionController {
 
     @GetMapping("/getCityList")
     @ApiOperation("获得区域城市列表")
-    @PreAuthenticated
+//    @PreAuthenticated
     public CommonResult<List<RegionRespVO>> getCityList() {
         List<RegionDO> cityList = regionService.getCityList();
         return success(RegionConvert.INSTANCE.convertList(cityList));
@@ -116,7 +115,7 @@ public class AppRegionController {
 
     @GetMapping("/getTradeCityList")
     @ApiOperation("获得始发、目的城市列表")
-    @PreAuthenticated
+//    @PreAuthenticated
     public CommonResult<List<RegionRespVO>> getTradeCityList(TradeRegionListReqVO reqVO) {
         if (Objects.nonNull(reqVO.getChannelId())){
             // 如果有渠道信息，则查询可出目的地国家下的目的地城市