diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java b/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java
index eadfb955..ed5e204d 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/conf/CacheConfig.java
@@ -1,9 +1,5 @@
 package com.ibeetl.admin.core.conf;
 
-import java.io.UnsupportedEncodingException;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cache.Cache;
@@ -23,6 +19,10 @@ import org.springframework.data.redis.listener.adapter.MessageListenerAdapter;
 import org.springframework.data.redis.serializer.JdkSerializationRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext.SerializationPair;
 
+import java.io.UnsupportedEncodingException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+
 /**
  * 支持一二级缓存，使得性能逆天快.默认不开启
  * 
@@ -30,8 +30,8 @@ import org.springframework.data.redis.serializer.RedisSerializationContext.Seria
  *
  */
 
-//@Configuration
-//@ConditionalOnProperty(name="springext.cache.enabled", havingValue="true" ,matchIfMissing=false)
+@Configuration
+@ConditionalOnProperty(name="springext.cache.enabled", havingValue="true" ,matchIfMissing=false)
 public class CacheConfig {
 
 	// 定义一个redis 的频道，默认叫cache，用于pub/sub
diff --git a/web/src/main/resources/application-dev.properties b/web/src/main/resources/application-dev.properties
index 798251e4..b42bd818 100644
--- a/web/src/main/resources/application-dev.properties
+++ b/web/src/main/resources/application-dev.properties
@@ -1,6 +1,9 @@
 #\u73AF\u5883\u6807\u8BC6
 admin.isOnline=false
 
+# \u9006\u5929\u7F13\u5B58\u5F00\u542F
+springext.cache.enabled=true
+
 logging.level.root=INFO
 #logging.level.root=DEBUG
 logging.level.org.springframework.web=DEBUG
diff --git a/web/src/main/resources/application-local.properties b/web/src/main/resources/application-local.properties
index 9bb68601..68eac683 100644
--- a/web/src/main/resources/application-local.properties
+++ b/web/src/main/resources/application-local.properties
@@ -1,6 +1,9 @@
 #\u73AF\u5883\u6807\u8BC6
 admin.isOnline=false
 
+# \u9006\u5929\u7F13\u5B58\u5F00\u542F
+springext.cache.enabled=true
+
 logging.level.root=INFO
 #logging.level.root=DEBUG
 logging.level.org.springframework.web=DEBUG
diff --git a/web/src/main/resources/application-prod.properties b/web/src/main/resources/application-prod.properties
index 763694c8..821e306f 100644
--- a/web/src/main/resources/application-prod.properties
+++ b/web/src/main/resources/application-prod.properties
@@ -1,6 +1,9 @@
 #\u73AF\u5883\u6807\u8BC6
 admin.isOnline=true
 
+# \u9006\u5929\u7F13\u5B58\u5F00\u542F
+springext.cache.enabled=true
+
 logging.level.root=ERROR
 #logging.level.root=DEBUG
 logging.level.org.springframework.web=DEBUG
diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourse.md b/web/src/main/resources/sql/jlw/teacherOpenCourse.md
index 83f7eff5..62f58a43 100644
--- a/web/src/main/resources/sql/jlw/teacherOpenCourse.md
+++ b/web/src/main/resources/sql/jlw/teacherOpenCourse.md
@@ -63,7 +63,7 @@ queryByCondition
     @if(!isEmpty(teacherOpenCourseMergeAuthCode)){
   and ta.teacher_open_course_merge_teacher_auth_code =#teacherOpenCourseMergeAuthCode#
     @}
-  order by ta.teacher_merge_application_order_index desc
+  order by ta.teacher_open_course_merge_teacher_order_index desc
 
 
 queryByConditionQuery
@@ -129,7 +129,7 @@ queryByConditionQuery
     @if(!isEmpty(teacherOpenCourseMergeAuthCode)){
   and ta.teacher_open_course_merge_teacher_auth_code =#teacherOpenCourseMergeAuthCode#
     @}
-  order by ta.teacher_merge_application_order_index desc
+  order by ta.teacher_open_course_merge_teacher_order_index desc
 
 deleteTeacherOpenCourseByIds
 ===