diff --git a/src/main/java/com/xkrs/model/validation/SysUserQoInsert.java b/src/main/java/com/xkrs/model/va/SysUserQoInsert.java similarity index 70% rename from src/main/java/com/xkrs/model/validation/SysUserQoInsert.java rename to src/main/java/com/xkrs/model/va/SysUserQoInsert.java index b7ce804..d842a53 100644 --- a/src/main/java/com/xkrs/model/validation/SysUserQoInsert.java +++ b/src/main/java/com/xkrs/model/va/SysUserQoInsert.java @@ -1,4 +1,4 @@ -package com.xkrs.model.validation; +package com.xkrs.model.va; /** * SysUserQoInsert diff --git a/src/main/java/com/xkrs/model/validation/SysUserQoUpdate.java b/src/main/java/com/xkrs/model/va/SysUserQoUpdate.java similarity index 70% rename from src/main/java/com/xkrs/model/validation/SysUserQoUpdate.java rename to src/main/java/com/xkrs/model/va/SysUserQoUpdate.java index 2c1d87d..c369218 100644 --- a/src/main/java/com/xkrs/model/validation/SysUserQoUpdate.java +++ b/src/main/java/com/xkrs/model/va/SysUserQoUpdate.java @@ -1,4 +1,4 @@ -package com.xkrs.model.validation; +package com.xkrs.model.va; /** * SysUserQoUpdate diff --git a/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java b/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java index 4ddbacb..2712bf8 100644 --- a/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java +++ b/src/main/java/com/xkrs/straw/controller/GaoDeApiController.java @@ -3,8 +3,8 @@ package com.xkrs.straw.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.model.vo.GaoDeIgGeocodeVo; -import com.xkrs.model.vo.GaoDeWeatherVo; +import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo; +import com.xkrs.straw.model.vo.GaoDeWeatherVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.i18n.LocaleContextHolder; diff --git a/src/main/java/com/xkrs/straw/controller/SysUserController.java b/src/main/java/com/xkrs/straw/controller/SysUserController.java index 4ad688e..6567ce0 100644 --- a/src/main/java/com/xkrs/straw/controller/SysUserController.java +++ b/src/main/java/com/xkrs/straw/controller/SysUserController.java @@ -2,8 +2,8 @@ package com.xkrs.straw.controller; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; import com.xkrs.common.encapsulation.PromptMessageEnum; -import com.xkrs.model.validation.SysUserQoInsert; -import com.xkrs.model.validation.SysUserQoUpdate; +import com.xkrs.model.va.SysUserQoInsert; +import com.xkrs.model.va.SysUserQoUpdate; import com.xkrs.service.RedisService; import com.xkrs.straw.dao.SysUserDao; import com.xkrs.straw.model.entity.SysUserEntity; diff --git a/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java b/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java index 8c84a96..5f3a2e2 100644 --- a/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java +++ b/src/main/java/com/xkrs/straw/helper/GeoCodeHelper.java @@ -1,6 +1,6 @@ package com.xkrs.straw.helper; -import com.xkrs.model.vo.GaoDeIgGeocodeVo; +import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo; import com.xkrs.straw.service.impl.DispatchFirePointServiceImpl; import com.xkrs.utils.GaoDeApiUtil; import org.apache.hc.core5.util.TextUtils; diff --git a/src/main/java/com/xkrs/straw/model/qo/SysUserQo.java b/src/main/java/com/xkrs/straw/model/qo/SysUserQo.java index 260887c..6b19e1e 100644 --- a/src/main/java/com/xkrs/straw/model/qo/SysUserQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/SysUserQo.java @@ -1,7 +1,7 @@ package com.xkrs.straw.model.qo; -import com.xkrs.model.validation.SysUserQoInsert; -import com.xkrs.model.validation.SysUserQoUpdate; +import com.xkrs.model.va.SysUserQoInsert; +import com.xkrs.model.va.SysUserQoUpdate; import org.hibernate.validator.constraints.Range; import javax.validation.constraints.NotBlank; diff --git a/src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java b/src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java index baa5dee..5ae52e0 100644 --- a/src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/SysUserReceiveSmsQo.java @@ -1,6 +1,6 @@ package com.xkrs.straw.model.qo; -import com.xkrs.model.validation.SysUserQoUpdate; +import com.xkrs.model.va.SysUserQoUpdate; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java b/src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java index b8b5a10..39f246f 100644 --- a/src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/SysUserRemarkQo.java @@ -1,6 +1,6 @@ package com.xkrs.straw.model.qo; -import com.xkrs.model.validation.SysUserQoUpdate; +import com.xkrs.model.va.SysUserQoUpdate; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java b/src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java index 0c56fa2..fd74073 100644 --- a/src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java +++ b/src/main/java/com/xkrs/straw/model/qo/SysUserVipLevelQo.java @@ -1,6 +1,6 @@ package com.xkrs.straw.model.qo; -import com.xkrs.model.validation.SysUserQoUpdate; +import com.xkrs.model.va.SysUserQoUpdate; import javax.validation.constraints.NotNull; diff --git a/src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java b/src/main/java/com/xkrs/straw/model/vo/GaoDeIgGeocodeVo.java similarity index 99% rename from src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java rename to src/main/java/com/xkrs/straw/model/vo/GaoDeIgGeocodeVo.java index 71ebb1c..b13d9cd 100644 --- a/src/main/java/com/xkrs/model/vo/GaoDeIgGeocodeVo.java +++ b/src/main/java/com/xkrs/straw/model/vo/GaoDeIgGeocodeVo.java @@ -1,4 +1,4 @@ -package com.xkrs.model.vo; +package com.xkrs.straw.model.vo; import java.util.List; diff --git a/src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java b/src/main/java/com/xkrs/straw/model/vo/GaoDeWeatherVo.java similarity index 99% rename from src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java rename to src/main/java/com/xkrs/straw/model/vo/GaoDeWeatherVo.java index d6d4f73..131b708 100644 --- a/src/main/java/com/xkrs/model/vo/GaoDeWeatherVo.java +++ b/src/main/java/com/xkrs/straw/model/vo/GaoDeWeatherVo.java @@ -1,4 +1,4 @@ -package com.xkrs.model.vo; +package com.xkrs.straw.model.vo; import java.util.List; diff --git a/src/main/java/com/xkrs/utils/GaoDeApiUtil.java b/src/main/java/com/xkrs/utils/GaoDeApiUtil.java index 7cd5294..49e0cf6 100644 --- a/src/main/java/com/xkrs/utils/GaoDeApiUtil.java +++ b/src/main/java/com/xkrs/utils/GaoDeApiUtil.java @@ -1,7 +1,7 @@ package com.xkrs.utils; import com.alibaba.fastjson.JSON; -import com.xkrs.model.vo.GaoDeIgGeocodeVo; +import com.xkrs.straw.model.vo.GaoDeIgGeocodeVo; import org.slf4j.Logger; import org.slf4j.LoggerFactory;