Merge remote-tracking branch 'origin/dev' into test

6 years ago · 16bb8d6714
parent 884d4fd763 c3da8f58a0
commit 16bb8d6714
2 changed files with 1 additions and 2 deletions
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java
@ -458,7 +458,6 @@ public class AndonEnumUtil {
        FORTH_LEVEL("40","四级");

        private String value;
-        private String code;
        private String description;

        ANDON_IMPORTANCE_LEVEL(String value,String description) {
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseImppRedis.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseImppRedis.java
@ -11,7 +11,7 @@ import java.util.Set;
 * @CreateDate : 2019-06-13 20:35
 * @Modify:
 **/
-public interface BaseImppRedis {
+public interface BaseRedis {

    /**
     * 指定缓存失效时间