Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/CofigBiz.java

 package com.xxfc.platform.app.biz;
 
+import com.ace.cache.annotation.Cache;
+import com.ace.cache.annotation.CacheClear;
 import com.alibaba.fastjson.JSON;
 import com.github.wxiaoqi.security.common.msg.TableResultResponse;
 import com.github.wxiaoqi.security.common.util.EntityUtils;
@@ -37,11 +39,13 @@ public class CofigBiz extends BaseBiz<CofigMapper,Cofig> {
      * @param cofig
      * @return
      */
+    @CacheClear(pre = "app:withdrawrule:",key = "config{1}")
     public int updateConfig(Cofig cofig) {
         EntityUtils.setUpdatedInfo(cofig);
        return mapper.updateByPrimaryKeySelective(cofig);
     }
 
+    @Cache(key = "app:withdrawrule:88")
     public WithDrawRuleVo getWithDrawRule(){
         WithDrawRuleVo withDrawRuleVo = new WithDrawRuleVo();
         Example example  = new Example(Cofig.class);

xx-im/xx-im-server/src/main/resources/mapper/ImCommentMapper.xml

@@ -19,7 +19,7 @@
   <select id="selectByQuestionId" resultType="com.xxfc.platform.im.entity.ImComment" parameterType="java.lang.Long">
         select * from im_comment
         where question_id = #{questionId} and is_del = 0
-        order by upd_time
+        order by time DESC
   </select>
 
 </mapper>
\ No newline at end of file

xx-im/xx-im-server/src/main/resources/mapper/ImPraiseMapper.xml

@@ -17,7 +17,7 @@
   <select id="selectByQuestionId" resultType="com.xxfc.platform.im.entity.ImPraise" parameterType="java.lang.Long">
         select * from im_praise
         where question_id = #{questionId} and is_del = 0 and visible = 1
-        order by upd_time
+        order by time DESC
   </select>
 
   <select id="selectByQuestionIdAndTime" resultType="com.xxfc.platform.im.entity.ImPraise" parameterType="com.xxfc.platform.im.dto.ImPraiseDto">