From 376f2ba621d10592d6bd5a5d4f33f56d8f0eaa1a Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期二, 06 八月 2024 20:08:00 +0800 Subject: [PATCH] 管理后台代码生成 --- ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java | 10 +- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserSiteMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableColumnService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TInvoiceTypeMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TRoleSiteService.java | 2 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCompanyMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEvaluationTagMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEvaluationTagServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TSystemConfigurationService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TInvoiceTypeServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TGoodsService.java | 2 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java | 1 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TNoticeServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEnterpriseUserApplicationMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TRoleSiteMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCompanyService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserSiteService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TIntegralRuleMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserTagServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableServiceImpl.java | 2 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java | 2 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java | 6 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TActivityMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserTagMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserTagService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCouponService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/THtmlMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TRoleSiteServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/THtmlServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableService.java | 2 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java | 25 ++++++ ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TNoticeService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEvaluationTagService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TSystemConfigurationServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TGoodsMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TIntegralRuleServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TNoticeMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/THtmlService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TInvoiceTypeService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TSystemConfigurationMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TIntegralRuleService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserSiteServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java | 2 /dev/null | 20 ----- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 31 ++++++- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableColumnServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java | 2 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableColumnMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEnterpriseUserApplicationService.java | 2 ruoyi-service/ruoyi-other/pom.xml | 12 ++ ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCouponMapper.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TActivityService.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEnterpriseUserApplicationServiceImpl.java | 2 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java | 2 64 files changed, 127 insertions(+), 92 deletions(-) diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java index e0bbbd8..fdef5e7 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java @@ -31,23 +31,23 @@ @TableId(value = "id", type = IdType.AUTO) private Integer id; - @ApiModelProperty(value = "充电得积分{"num1":1}") + @ApiModelProperty(value = "充电得积分{\"num1\":1}") @TableField("charge_credit") private String chargeCredit; - @ApiModelProperty(value = "好评得积分{"num1":1}") + @ApiModelProperty(value = "好评得积分{\"num1\":1}") @TableField("credit") private String credit; - @ApiModelProperty(value = "添加车辆得积分{"num1":1,"num2":1,"num3":1,"num4":1}") + @ApiModelProperty(value = "添加车辆得积分{\"num1\":1,\"num2\":1,\"num3\":1,\"num4\":1}") @TableField("add_vehicles_earns_points") private String addVehiclesEarnsPoints; - @ApiModelProperty(value = "邀请用户得积分{"num1":1}") + @ApiModelProperty(value = "邀请用户得积分{\"num1\":1}") @TableField("invite_users_to_earn_points") private String inviteUsersToEarnPoints; - @ApiModelProperty(value = "签到得积分{"num1":1,"num2":[{"num1":1,"num2":1}]}") + @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[{\"num1\":1,\"num2\":1}]}") @TableField("sign_in_for_points") private String signInForPoints; diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java index fc67729..137ff52 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TSystemConfiguration.java @@ -35,7 +35,7 @@ @TableField("type") private Integer type; - @ApiModelProperty(value = "设置内容JSON{"num1":1,"num2":1}") + @ApiModelProperty(value = "设置内容JSON{\"num1\":1,\"num2\":1}") @TableField("content") private String content; diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java index 6bbc32d..99b4ad4 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TUserTag.java @@ -37,7 +37,7 @@ @TableField("standard_condition") private Integer standardCondition; - @ApiModelProperty(value = "达标条件值JSON({"day":1,"times":5})") + @ApiModelProperty(value = "达标条件值JSON({\"day\":1,\"times\":5})") @TableField("condition") private String condition; diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java index 379e58c..cb1a418 100644 --- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TVip.java @@ -121,7 +121,7 @@ @TableField("deduction_type") private Integer deductionType; - @ApiModelProperty(value = "优惠券[{"id":1,"number":1}]") + @ApiModelProperty(value = "优惠券[{\"id\":1,\"number\":1}]") @TableField("coupon") private String coupon; diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java new file mode 100644 index 0000000..2a8cf7e --- /dev/null +++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/SaveIntegralDTO.java @@ -0,0 +1,25 @@ +package com.ruoyi.other.api.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +@ApiModel("积分规则DTO") +public class SaveIntegralDTO { + + @ApiModelProperty(value = "id") + private Integer id; + @ApiModelProperty(value = "充电得积分{\"num1\":1}") + private String chargeCredit; + @ApiModelProperty(value = "好评得积分{\"num1\":1}") + private String credit; + @ApiModelProperty(value = "添加车辆得积分{\"num1\":1,\"num2\":1,\"num3\":1,\"num4\":1}") + private String addVehiclesEarnsPoints; + @ApiModelProperty(value = "邀请用户得积分{\"num1\":1}") + private String invite_users_to_earn_points; + @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[{\"num1\":1,\"num2\":1}]}") + private String signInForPoints; +} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java index f09fe52..aa0baaf 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/CompanyUserVo.java @@ -1,6 +1,6 @@ package com.ruoyi.system.domain.vo; -import com.ruoyi.management.api.model.TCompanyShop; +//import com.ruoyi.management.api.model.TCompanyShop; import com.ruoyi.system.api.domain.SysUser; import lombok.Data; @@ -16,6 +16,6 @@ @NotBlank(message = "请选择关联门店") private List<Integer> shopIds; - @NotBlank(message = "关联门店") - private List<TCompanyShop> shopList; +// @NotBlank(message = "关联门店") +// private List<TCompanyShop> shopList; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 63ba0b2..3f08d28 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.core.web.page.PageInfo; -import com.ruoyi.management.api.model.TCompanyShopToUser; import com.ruoyi.system.api.domain.SysUser; /** diff --git a/ruoyi-service/ruoyi-other/pom.xml b/ruoyi-service/ruoyi-other/pom.xml index 04be23b..6f0706a 100644 --- a/ruoyi-service/ruoyi-other/pom.xml +++ b/ruoyi-service/ruoyi-other/pom.xml @@ -15,12 +15,16 @@ </description> <dependencies> + <!-- SpringCloud Alibaba Nacos --> <dependency> <groupId>com.alibaba.cloud</groupId> <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId> </dependency> - + <dependency> + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi-api-other</artifactId> + </dependency> <!-- SpringCloud Alibaba Nacos Config --> <dependency> <groupId>com.alibaba.cloud</groupId> @@ -100,6 +104,12 @@ <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>com.ruoyi</groupId> + <artifactId>ruoyi-api-other</artifactId> + <version>3.6.2</version> + <scope>compile</scope> + </dependency> </dependencies> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SysDictDataController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SysDictDataController.java deleted file mode 100644 index f07db1c..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SysDictDataController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.other.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -@RestController -@RequestMapping("/sys-dict-data") -public class SysDictDataController { - -} - diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SysDictTypeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SysDictTypeController.java deleted file mode 100644 index 5bc3efa..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SysDictTypeController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.other.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -@RestController -@RequestMapping("/sys-dict-type") -public class SysDictTypeController { - -} - diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SysNoticeController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SysNoticeController.java deleted file mode 100644 index 2700cf5..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/SysNoticeController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.ruoyi.other.controller; - - -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; - -/** - * <p> - * 前端控制器 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -@RestController -@RequestMapping("/sys-notice") -public class SysNoticeController { - -} - diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java index fd667e3..5fe7e70 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java @@ -1,9 +1,11 @@ package com.ruoyi.other.controller; -import org.springframework.web.bind.annotation.RequestMapping; - -import org.springframework.web.bind.annotation.RestController; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.core.domain.R; +import com.ruoyi.other.api.dto.SaveIntegralDTO; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; /** * <p> @@ -14,8 +16,27 @@ * @since 2024-08-06 */ @RestController -@RequestMapping("/t-integral-rule") +@RequestMapping("/integral") public class TIntegralRuleController { - + @GetMapping("/getSet") + @ApiOperation(value = "获取积分设置") + public R<SaveIntegralDTO> getSet() { + return R.ok(); + } + @PostMapping("/saveSet") + @ApiOperation(value = "保存积分设置") + public R saveSet(@RequestBody SaveIntegralDTO dto) { + return R.ok(); + } + @PostMapping("/getInfo") + @ApiOperation(value = "获取积分说明") + public R getInfo() { + return R.ok(); + } + @PostMapping("/saveInfo") + @ApiOperation(value = "保存积分说明") + public R saveInfo() { + return R.ok(); + } } diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableColumnMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableColumnMapper.java index eb47678..f30043c 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableColumnMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableColumnMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.GenTableColumn; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.GenTableColumn; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableMapper.java index 99530d2..4c9d44f 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/GenTableMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.GenTable; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.GenTable; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysDictDataMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysDictDataMapper.java deleted file mode 100644 index af11ace..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysDictDataMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.other.mapper; - -import com.ruoyi.other.model.SysDictData; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -public interface SysDictDataMapper extends BaseMapper<SysDictData> { - -} diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysDictTypeMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysDictTypeMapper.java deleted file mode 100644 index 017499a..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysDictTypeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.other.mapper; - -import com.ruoyi.other.model.SysDictType; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -public interface SysDictTypeMapper extends BaseMapper<SysDictType> { - -} diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysNoticeMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysNoticeMapper.java deleted file mode 100644 index 22acc76..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/SysNoticeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.other.mapper; - -import com.ruoyi.other.model.SysNotice; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * <p> - * Mapper 接口 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -public interface SysNoticeMapper extends BaseMapper<SysNotice> { - -} diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TActivityMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TActivityMapper.java index 51513d7..f8940d8 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TActivityMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TActivityMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TActivity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TActivity; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java index 8a6a472..3153da8 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TAdvertisingMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TAdvertising; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TAdvertising; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCompanyMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCompanyMapper.java index e863be8..e36fba1 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCompanyMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCompanyMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TCompany; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TCompany; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCouponMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCouponMapper.java index a962323..d2927d2 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCouponMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TCouponMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TCoupon; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TCoupon; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEnterpriseUserApplicationMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEnterpriseUserApplicationMapper.java index 2c530ca..55805f5 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEnterpriseUserApplicationMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEnterpriseUserApplicationMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TEnterpriseUserApplication; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TEnterpriseUserApplication; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEvaluationTagMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEvaluationTagMapper.java index 0c20f83..986b666 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEvaluationTagMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TEvaluationTagMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TEvaluationTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TEvaluationTag; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TGoodsMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TGoodsMapper.java index a71748b..8b0b3e7 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TGoodsMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TGoodsMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TGoods; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TGoods; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/THtmlMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/THtmlMapper.java index 3602e18..952355e 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/THtmlMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/THtmlMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.THtml; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.THtml; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TIntegralRuleMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TIntegralRuleMapper.java index ff2cc2e..9ac1131 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TIntegralRuleMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TIntegralRuleMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TIntegralRule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TIntegralRule; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TInvoiceTypeMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TInvoiceTypeMapper.java index fb9d613..5b284f1 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TInvoiceTypeMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TInvoiceTypeMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TInvoiceType; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TInvoiceType; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TNoticeMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TNoticeMapper.java index bd38cbb..ba51ef9 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TNoticeMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TNoticeMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TNotice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TNotice; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TRoleSiteMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TRoleSiteMapper.java index 0420a47..4773626 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TRoleSiteMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TRoleSiteMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TRoleSite; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TRoleSite; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TSystemConfigurationMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TSystemConfigurationMapper.java index 8c4e36c..8713e7e 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TSystemConfigurationMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TSystemConfigurationMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TSystemConfiguration; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TSystemConfiguration; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserSiteMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserSiteMapper.java index c097e86..17daff7 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserSiteMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserSiteMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TUserSite; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TUserSite; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserTagMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserTagMapper.java index 6ee0524..d0ee805 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserTagMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TUserTagMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TUserTag; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TUserTag; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java index 767460a..afe3260 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TVipMapper.java @@ -1,7 +1,7 @@ package com.ruoyi.other.mapper; -import com.ruoyi.other.model.TVip; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.other.api.domain.TVip; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableColumnService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableColumnService.java index c120f6e..a2c10ab 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableColumnService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableColumnService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.GenTableColumn; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.GenTableColumn; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableService.java index 583d2c9..df5081b 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/GenTableService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.GenTable; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.GenTable; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SysDictDataService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SysDictDataService.java deleted file mode 100644 index 1cede30..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SysDictDataService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.other.service; - -import com.ruoyi.other.model.SysDictData; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -public interface SysDictDataService extends IService<SysDictData> { - -} diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SysDictTypeService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SysDictTypeService.java deleted file mode 100644 index c257700..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SysDictTypeService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.other.service; - -import com.ruoyi.other.model.SysDictType; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -public interface SysDictTypeService extends IService<SysDictType> { - -} diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SysNoticeService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SysNoticeService.java deleted file mode 100644 index 7cb6b86..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/SysNoticeService.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.ruoyi.other.service; - -import com.ruoyi.other.model.SysNotice; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * <p> - * 服务类 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -public interface SysNoticeService extends IService<SysNotice> { - -} diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TActivityService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TActivityService.java index 5570b05..e3be327 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TActivityService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TActivityService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TActivity; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TActivity; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java index 9a05e68..79e985e 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TAdvertisingService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TAdvertising; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TAdvertising; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCompanyService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCompanyService.java index 500cf17..4cd0b9f 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCompanyService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCompanyService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TCompany; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TCompany; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCouponService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCouponService.java index d95646c..cfe2ac7 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCouponService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TCouponService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TCoupon; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TCoupon; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEnterpriseUserApplicationService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEnterpriseUserApplicationService.java index 36b5def..ef4064b 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEnterpriseUserApplicationService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEnterpriseUserApplicationService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TEnterpriseUserApplication; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TEnterpriseUserApplication; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEvaluationTagService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEvaluationTagService.java index fe097d3..074149f 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEvaluationTagService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TEvaluationTagService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TEvaluationTag; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TEvaluationTag; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TGoodsService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TGoodsService.java index cbd3c89..80af36e 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TGoodsService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TGoodsService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TGoods; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TGoods; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/THtmlService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/THtmlService.java index 6f696fa..ca704f2 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/THtmlService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/THtmlService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.THtml; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.THtml; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TIntegralRuleService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TIntegralRuleService.java index 4251b64..c954ace 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TIntegralRuleService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TIntegralRuleService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TIntegralRule; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TIntegralRule; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TInvoiceTypeService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TInvoiceTypeService.java index 2be206e..2f3502e 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TInvoiceTypeService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TInvoiceTypeService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TInvoiceType; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TInvoiceType; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TNoticeService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TNoticeService.java index f7ccf05..4467c12 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TNoticeService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TNoticeService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TNotice; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TNotice; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TRoleSiteService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TRoleSiteService.java index 471d057..cb651c9 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TRoleSiteService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TRoleSiteService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TRoleSite; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TRoleSite; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TSystemConfigurationService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TSystemConfigurationService.java index 0d937ae..8f26cc6 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TSystemConfigurationService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TSystemConfigurationService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TSystemConfiguration; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TSystemConfiguration; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserSiteService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserSiteService.java index 261507c..f4f95b2 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserSiteService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserSiteService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TUserSite; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TUserSite; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserTagService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserTagService.java index 4ecfa0d..f727025 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserTagService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TUserTagService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TUserTag; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TUserTag; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java index 5db97cf..8f83c50 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TVipService.java @@ -1,7 +1,7 @@ package com.ruoyi.other.service; -import com.ruoyi.other.model.TVip; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.other.api.domain.TVip; /** * <p> diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableColumnServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableColumnServiceImpl.java index 4dca099..f6585a7 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableColumnServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableColumnServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.GenTableColumn; +import com.ruoyi.other.api.domain.GenTableColumn; import com.ruoyi.other.mapper.GenTableColumnMapper; import com.ruoyi.other.service.GenTableColumnService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableServiceImpl.java index 8d82ca5..de1b149 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GenTableServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.GenTable; +import com.ruoyi.other.api.domain.GenTable; import com.ruoyi.other.mapper.GenTableMapper; import com.ruoyi.other.service.GenTableService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SysDictDataServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SysDictDataServiceImpl.java deleted file mode 100644 index 67715e9..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SysDictDataServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ruoyi.other.service.impl; - -import com.ruoyi.other.model.SysDictData; -import com.ruoyi.other.mapper.SysDictDataMapper; -import com.ruoyi.other.service.SysDictDataService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -@Service -public class SysDictDataServiceImpl extends ServiceImpl<SysDictDataMapper, SysDictData> implements SysDictDataService { - -} diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SysDictTypeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SysDictTypeServiceImpl.java deleted file mode 100644 index 3465cf4..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SysDictTypeServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ruoyi.other.service.impl; - -import com.ruoyi.other.model.SysDictType; -import com.ruoyi.other.mapper.SysDictTypeMapper; -import com.ruoyi.other.service.SysDictTypeService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -@Service -public class SysDictTypeServiceImpl extends ServiceImpl<SysDictTypeMapper, SysDictType> implements SysDictTypeService { - -} diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SysNoticeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SysNoticeServiceImpl.java deleted file mode 100644 index 5de986d..0000000 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/SysNoticeServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.ruoyi.other.service.impl; - -import com.ruoyi.other.model.SysNotice; -import com.ruoyi.other.mapper.SysNoticeMapper; -import com.ruoyi.other.service.SysNoticeService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - * <p> - * 服务实现类 - * </p> - * - * @author 无关风月 - * @since 2024-08-06 - */ -@Service -public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice> implements SysNoticeService { - -} diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java index 619bf1e..79fbc75 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TActivityServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TActivity; +import com.ruoyi.other.api.domain.TActivity; import com.ruoyi.other.mapper.TActivityMapper; import com.ruoyi.other.service.TActivityService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java index ace718e..dcccafd 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TAdvertisingServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TAdvertising; +import com.ruoyi.other.api.domain.TAdvertising; import com.ruoyi.other.mapper.TAdvertisingMapper; import com.ruoyi.other.service.TAdvertisingService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyServiceImpl.java index 0cf821a..a13af5d 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCompanyServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TCompany; +import com.ruoyi.other.api.domain.TCompany; import com.ruoyi.other.mapper.TCompanyMapper; import com.ruoyi.other.service.TCompanyService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java index 50cbccd..eb7892a 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TCouponServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TCoupon; +import com.ruoyi.other.api.domain.TCoupon; import com.ruoyi.other.mapper.TCouponMapper; import com.ruoyi.other.service.TCouponService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEnterpriseUserApplicationServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEnterpriseUserApplicationServiceImpl.java index dfd65d0..6f8a356 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEnterpriseUserApplicationServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEnterpriseUserApplicationServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TEnterpriseUserApplication; +import com.ruoyi.other.api.domain.TEnterpriseUserApplication; import com.ruoyi.other.mapper.TEnterpriseUserApplicationMapper; import com.ruoyi.other.service.TEnterpriseUserApplicationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEvaluationTagServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEvaluationTagServiceImpl.java index 69720fa..459f90b 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEvaluationTagServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TEvaluationTagServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TEvaluationTag; +import com.ruoyi.other.api.domain.TEvaluationTag; import com.ruoyi.other.mapper.TEvaluationTagMapper; import com.ruoyi.other.service.TEvaluationTagService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java index a469d5e..c3e86ce 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TGoodsServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TGoods; +import com.ruoyi.other.api.domain.TGoods; import com.ruoyi.other.mapper.TGoodsMapper; import com.ruoyi.other.service.TGoodsService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/THtmlServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/THtmlServiceImpl.java index 6753498..b3dec3a 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/THtmlServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/THtmlServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.THtml; +import com.ruoyi.other.api.domain.THtml; import com.ruoyi.other.mapper.THtmlMapper; import com.ruoyi.other.service.THtmlService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TIntegralRuleServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TIntegralRuleServiceImpl.java index 6a718c8..0a18e9d 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TIntegralRuleServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TIntegralRuleServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TIntegralRule; +import com.ruoyi.other.api.domain.TIntegralRule; import com.ruoyi.other.mapper.TIntegralRuleMapper; import com.ruoyi.other.service.TIntegralRuleService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TInvoiceTypeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TInvoiceTypeServiceImpl.java index 1f9db9d..f96a0aa 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TInvoiceTypeServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TInvoiceTypeServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TInvoiceType; +import com.ruoyi.other.api.domain.TInvoiceType; import com.ruoyi.other.mapper.TInvoiceTypeMapper; import com.ruoyi.other.service.TInvoiceTypeService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TNoticeServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TNoticeServiceImpl.java index 3019432..7011048 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TNoticeServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TNoticeServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TNotice; +import com.ruoyi.other.api.domain.TNotice; import com.ruoyi.other.mapper.TNoticeMapper; import com.ruoyi.other.service.TNoticeService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TRoleSiteServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TRoleSiteServiceImpl.java index dd7ca7d..89c49f3 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TRoleSiteServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TRoleSiteServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TRoleSite; +import com.ruoyi.other.api.domain.TRoleSite; import com.ruoyi.other.mapper.TRoleSiteMapper; import com.ruoyi.other.service.TRoleSiteService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TSystemConfigurationServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TSystemConfigurationServiceImpl.java index 3a1bb59..b879b30 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TSystemConfigurationServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TSystemConfigurationServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TSystemConfiguration; +import com.ruoyi.other.api.domain.TSystemConfiguration; import com.ruoyi.other.mapper.TSystemConfigurationMapper; import com.ruoyi.other.service.TSystemConfigurationService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserSiteServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserSiteServiceImpl.java index eb02031..fe928db 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserSiteServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserSiteServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TUserSite; +import com.ruoyi.other.api.domain.TUserSite; import com.ruoyi.other.mapper.TUserSiteMapper; import com.ruoyi.other.service.TUserSiteService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserTagServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserTagServiceImpl.java index a37a020..f61e9ff 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserTagServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TUserTagServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TUserTag; +import com.ruoyi.other.api.domain.TUserTag; import com.ruoyi.other.mapper.TUserTagMapper; import com.ruoyi.other.service.TUserTagService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java index 4526dc4..eaf0d38 100644 --- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java +++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TVipServiceImpl.java @@ -1,6 +1,6 @@ package com.ruoyi.other.service.impl; -import com.ruoyi.other.model.TVip; +import com.ruoyi.other.api.domain.TVip; import com.ruoyi.other.mapper.TVipMapper; import com.ruoyi.other.service.TVipService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -- Gitblit v1.7.1