diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopExpressController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopExpressController.java index 562dd24..c638b0f 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopExpressController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopExpressController.java @@ -22,7 +22,7 @@ import java.util.List; * 物流公司控制器 * * @author 科技小王子 - * @since 2025-08-12 11:52:07 + * @since 2025-08-12 12:07:03 */ @Tag(name = "物流公司管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopExpressTemplateController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopExpressTemplateController.java index 35831d4..bbc7ac2 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopExpressTemplateController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopExpressTemplateController.java @@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -22,7 +22,7 @@ import java.util.List; * 运费模板控制器 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ @Tag(name = "运费模板管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopExpressTemplateDetailController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopExpressTemplateDetailController.java index 50d2b96..6c1553d 100644 --- a/src/main/java/com/gxwebsoft/shop/controller/ShopExpressTemplateDetailController.java +++ b/src/main/java/com/gxwebsoft/shop/controller/ShopExpressTemplateDetailController.java @@ -10,8 +10,8 @@ import com.gxwebsoft.common.core.web.PageParam; import com.gxwebsoft.common.core.web.BatchParam; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.system.entity.User; -import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @@ -22,7 +22,7 @@ import java.util.List; * 运费模板控制器 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ @Tag(name = "运费模板管理") @RestController diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopExpress.java b/src/main/java/com/gxwebsoft/shop/entity/ShopExpress.java index b243a04..f3fa4ca 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopExpress.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopExpress.java @@ -2,10 +2,9 @@ package com.gxwebsoft.shop.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; -import java.util.Date; - import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +13,7 @@ import lombok.EqualsAndHashCode; * 物流公司 * * @author 科技小王子 - * @since 2025-08-12 11:52:07 + * @since 2025-08-12 12:07:03 */ @Data @EqualsAndHashCode(callSuper = false) @@ -49,9 +48,9 @@ public class ShopExpress implements Serializable { private Integer tenantId; @Schema(description = "创建时间") - private Date createTime; + private LocalDateTime createTime; @Schema(description = "修改时间") - private Date updateTime; + private LocalDateTime updateTime; } diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopExpressTemplate.java b/src/main/java/com/gxwebsoft/shop/entity/ShopExpressTemplate.java index 1217693..2c14072 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopExpressTemplate.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopExpressTemplate.java @@ -7,7 +7,6 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +14,7 @@ import lombok.EqualsAndHashCode; * 运费模板 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/entity/ShopExpressTemplateDetail.java b/src/main/java/com/gxwebsoft/shop/entity/ShopExpressTemplateDetail.java index f4431ae..5474ff0 100644 --- a/src/main/java/com/gxwebsoft/shop/entity/ShopExpressTemplateDetail.java +++ b/src/main/java/com/gxwebsoft/shop/entity/ShopExpressTemplateDetail.java @@ -7,7 +7,6 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.TableLogic; import java.io.Serializable; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -15,7 +14,7 @@ import lombok.EqualsAndHashCode; * 运费模板 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressMapper.java index 910ff55..1d236e7 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 物流公司Mapper * * @author 科技小王子 - * @since 2025-08-12 11:52:07 + * @since 2025-08-12 12:07:03 */ public interface ShopExpressMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressTemplateDetailMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressTemplateDetailMapper.java index cbb93ee..fd26f85 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressTemplateDetailMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressTemplateDetailMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 运费模板Mapper * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ public interface ShopExpressTemplateDetailMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressTemplateMapper.java b/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressTemplateMapper.java index 215e6ef..a205498 100644 --- a/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressTemplateMapper.java +++ b/src/main/java/com/gxwebsoft/shop/mapper/ShopExpressTemplateMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 运费模板Mapper * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ public interface ShopExpressTemplateMapper extends BaseMapper { diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopExpressParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopExpressParam.java index 4d59003..ce43740 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopExpressParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopExpressParam.java @@ -13,7 +13,7 @@ import lombok.EqualsAndHashCode; * 物流公司查询参数 * * @author 科技小王子 - * @since 2025-08-12 11:52:07 + * @since 2025-08-12 12:07:03 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopExpressTemplateDetailParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopExpressTemplateDetailParam.java index 8501b44..6a2f8c9 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopExpressTemplateDetailParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopExpressTemplateDetailParam.java @@ -6,7 +6,6 @@ import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +13,7 @@ import lombok.EqualsAndHashCode; * 运费模板查询参数 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/param/ShopExpressTemplateParam.java b/src/main/java/com/gxwebsoft/shop/param/ShopExpressTemplateParam.java index db3336e..43c4ebd 100644 --- a/src/main/java/com/gxwebsoft/shop/param/ShopExpressTemplateParam.java +++ b/src/main/java/com/gxwebsoft/shop/param/ShopExpressTemplateParam.java @@ -6,7 +6,6 @@ import com.gxwebsoft.common.core.annotation.QueryType; import com.gxwebsoft.common.core.web.BaseParam; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; @@ -14,7 +13,7 @@ import lombok.EqualsAndHashCode; * 运费模板查询参数 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ @Data @EqualsAndHashCode(callSuper = false) diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopExpressService.java b/src/main/java/com/gxwebsoft/shop/service/ShopExpressService.java index e7e3182..92dae06 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopExpressService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopExpressService.java @@ -11,7 +11,7 @@ import java.util.List; * 物流公司Service * * @author 科技小王子 - * @since 2025-08-12 11:52:07 + * @since 2025-08-12 12:07:03 */ public interface ShopExpressService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopExpressTemplateDetailService.java b/src/main/java/com/gxwebsoft/shop/service/ShopExpressTemplateDetailService.java index 1f518f5..b63be6f 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopExpressTemplateDetailService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopExpressTemplateDetailService.java @@ -11,7 +11,7 @@ import java.util.List; * 运费模板Service * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ public interface ShopExpressTemplateDetailService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/ShopExpressTemplateService.java b/src/main/java/com/gxwebsoft/shop/service/ShopExpressTemplateService.java index ba2b3bc..0c8c003 100644 --- a/src/main/java/com/gxwebsoft/shop/service/ShopExpressTemplateService.java +++ b/src/main/java/com/gxwebsoft/shop/service/ShopExpressTemplateService.java @@ -11,7 +11,7 @@ import java.util.List; * 运费模板Service * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ public interface ShopExpressTemplateService extends IService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressServiceImpl.java index e374ae1..1a7cdbc 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 物流公司Service实现 * * @author 科技小王子 - * @since 2025-08-12 11:52:07 + * @since 2025-08-12 12:07:03 */ @Service public class ShopExpressServiceImpl extends ServiceImpl implements ShopExpressService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressTemplateDetailServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressTemplateDetailServiceImpl.java index e6c25db..2c5ea8b 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressTemplateDetailServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressTemplateDetailServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 运费模板Service实现 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ @Service public class ShopExpressTemplateDetailServiceImpl extends ServiceImpl implements ShopExpressTemplateDetailService { diff --git a/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressTemplateServiceImpl.java b/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressTemplateServiceImpl.java index 3df97d0..1858d49 100644 --- a/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressTemplateServiceImpl.java +++ b/src/main/java/com/gxwebsoft/shop/service/impl/ShopExpressTemplateServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 运费模板Service实现 * * @author 科技小王子 - * @since 2025-05-01 10:04:21 + * @since 2025-08-12 12:07:03 */ @Service public class ShopExpressTemplateServiceImpl extends ServiceImpl implements ShopExpressTemplateService { diff --git a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java index 707de09..1cd65d9 100644 --- a/src/test/java/com/gxwebsoft/generator/ShopGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/ShopGenerator.java @@ -27,7 +27,7 @@ public class ShopGenerator { // JAVA输出目录 private static final String OUTPUT_DIR = "/src/main/java"; // Vue文件输出位置 - private static final String OUTPUT_LOCATION_VUE = "/Users/gxwebsoft/VUE/web/mp-vue"; + private static final String OUTPUT_LOCATION_VUE = "/Users/gxwebsoft/VUE/mp-vue"; // UniApp文件输出目录 private static final String OUTPUT_LOCATION_UNIAPP = "/Users/gxwebsoft/VUE/template-10550"; // Vue文件输出目录