diff --git a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java index e8922afd60c9458dd7dffab6012d4db13497050b..8b889f4d19050e315e37bb757521b811fc19f8f7 100644 --- a/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java +++ b/maku-boot-system/src/main/java/net/maku/system/dao/SysDictDataDao.java @@ -2,12 +2,7 @@ package net.maku.system.dao; import net.maku.framework.common.dao.BaseDao; import net.maku.system.entity.SysDictDataEntity; -import net.maku.system.vo.SysDictVO; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; /** * 字典数据 @@ -17,7 +12,4 @@ import java.util.List; @Mapper public interface SysDictDataDao extends BaseDao { - @Select("${sql}") - List selectListForSql(@Param("sql") String sql); - } diff --git a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java index fa3b88e2dc5fdc43d06af9c167050acf3e707748..471b021aa635a68f8e3c0655c5baa3e6ea51c7be 100644 --- a/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java +++ b/maku-boot-system/src/main/java/net/maku/system/entity/SysDictTypeEntity.java @@ -30,12 +30,4 @@ public class SysDictTypeEntity extends BaseEntity { * 排序 */ private Integer sort; - /** - * 类型:1 静态常量 2 动态SQL - */ - private Integer type; - /** - * 动态sql - */ - private String sourceSql; } \ No newline at end of file diff --git a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java index 44e4fe3a27df2e08b4084127eb54405e651b5228..3fe0723e56e24a50e8a94016d73df0e9a9fe119c 100644 --- a/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java +++ b/maku-boot-system/src/main/java/net/maku/system/service/impl/SysDictTypeServiceImpl.java @@ -18,7 +18,6 @@ import net.maku.system.service.SysDictTypeService; import net.maku.system.vo.SysDictVO; import net.maku.system.query.SysDictTypeQuery; import net.maku.system.vo.SysDictTypeVO; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -93,18 +92,6 @@ public class SysDictTypeServiceImpl extends BaseServiceImpl