Merge remote-tracking branch 'origin/release' into release

sql/update_V2.2.1.sql

+-- 增加区号
+alter table ecw_region add COLUMN area_code varchar(32) DEFAULT NULL comment '区号';

yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/controller/admin/region/vo/RegionBaseVO.java

@@ -59,4 +59,6 @@ public class RegionBaseVO {
     private String importCurrency4;
     @ApiModelProperty(value = "应收额币种", required = false)
     private String importCurrency5;
+    @ApiModelProperty(value = "区号", required = false)
+    private String areaCode;
 }

yudao-module-ecw/yudao-module-ecw-impl/src/main/java/cn/iocoder/yudao/module/ecw/dal/dataobject/region/RegionDO.java

 package cn.iocoder.yudao.module.ecw.dal.dataobject.region;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@@ -93,4 +92,8 @@ public class RegionDO extends BaseDO {
      * 进口国应收额币种
      */
     private String importCurrency5;
+    /**
+     * 区号
+     */
+    private String areaCode;
 }