Merge branch 'online' into test

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/TenantInfoController.java

@@ -98,6 +98,13 @@ public class TenantInfoController extends BaseController {
 
         TenantInfo tenantInfo = JSON.parseObject(info.jsonString(), TenantInfo.class);
         tenantInfoService.updateById(tenantInfo);
+        // 更新地区
+        tenantInfoService.lambdaUpdate()
+                .eq(TenantInfo::getId, tenantInfo.getId())
+                .set(TenantInfo::getProvinceCode, tenantInfo.getProvinceCode())
+                .set(TenantInfo::getCityCode, tenantInfo.getCityCode())
+                .set(TenantInfo::getRegionCode, tenantInfo.getRegionCode())
+                .update();
 
         return  HttpResponseResult.succeed(true);
 

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/io/request/TenantInfoVo.java

@@ -36,11 +36,11 @@ public class TenantInfoVo {
         private Integer provinceCode;
 
         @ApiModelProperty("城市编码")
-        @NotNull
+//        @NotNull
         private Integer cityCode;
 
         @ApiModelProperty("地区/街道")
-        @NotNull
+//        @NotNull
         private Integer regionCode;
 
         public String jsonString() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantApplyRecordServiceImpl.java

@@ -157,9 +157,11 @@ public class TenantApplyRecordServiceImpl extends ServiceImpl<TenantApplyRecordM
                 .eq(TenantApplyRecord::getId, tenantApplyRecord.getId())
                 .set(TenantApplyRecord::getVerifyUserId, null)
                 .set(TenantApplyRecord::getReason, null)
+                .set(TenantApplyRecord::getProvinceCode, tenantApply.getProvinceCode())
+                .set(TenantApplyRecord::getCityCode, tenantApply.getCityCode())
+                .set(TenantApplyRecord::getRegionCode, tenantApply.getRegionCode())
                 .update();
 
-
     }
 
     @Override