Merge branch 'online' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/resources/config/mybatis/ImGroupMapper.xml

@@ -28,8 +28,12 @@
             <if test="et.autoPassFlag != null">
                 auto_pass_flag_ = #{et.autoPassFlag},
             </if>
-            introduce_ = #{et.introduce},
-            memo_ = #{et.memo},
+            <if test="et.introduce != null and et.introduce != ''">
+                introduce_ = #{et.introduce},
+            </if>
+            <if test="et.memo != null and et.memo != ''">
+                memo_ = #{et.memo},
+            </if>
             update_time_ = NOW()
         </set>
         where id_ = #{et.id}

cooleshow-user/user-classroom/src/main/resources/logback-spring.xml

@@ -52,7 +52,7 @@
 
 	<!--生产环境:输出到文件 -->
 	<springProfile name="prod">
-		<root level="DEBUG">
+		<root level="INFO">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>