diff --git a/yshop-system/src/main/resources/template/generator/admin/ControllerP.ftl b/yshop-system/src/main/resources/template/generator/admin/ControllerP.ftl index 0d1ff977..ef11f71b 100644 --- a/yshop-system/src/main/resources/template/generator/admin/ControllerP.ftl +++ b/yshop-system/src/main/resources/template/generator/admin/ControllerP.ftl @@ -10,7 +10,7 @@ package ${package}.rest; import java.util.Arrays; import co.yixiang.dozer.service.IGenerator; import lombok.AllArgsConstructor; -import co.yixiang.aop.log.Log; +import co.yixiang.logging.aop.log.Log; import ${package}.domain.${className}; import ${package}.service.${className}Service; import ${package}.service.dto.${className}QueryCriteria; diff --git a/yshop-system/src/main/resources/template/generator/admin/EntityP.ftl b/yshop-system/src/main/resources/template/generator/admin/EntityP.ftl index 36db6ebb..41d7ddd1 100644 --- a/yshop-system/src/main/resources/template/generator/admin/EntityP.ftl +++ b/yshop-system/src/main/resources/template/generator/admin/EntityP.ftl @@ -7,10 +7,9 @@ * 一经发现盗用、分享等行为,将追究法律责任,后果自负 */ package ${package}.domain; -import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; -import com.baomidou.mybatisplus.annotation.FieldFill; -import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; <#if isNotNullColumns??>