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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserAlipay.java

 package com.github.wxiaoqi.security.admin.entity;
 
 import io.swagger.annotations.ApiModelProperty;
-
+import lombok.Data;
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
-import java.util.Date;
 
 /**
  * 支付宝账号表
  */
 @Table(name = "app_user_alipay")
+@Data
 public class AppUserAlipay {
     @Id
     @GeneratedValue(generator = "JDBC")//此处加上注解

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserRelationController.java

@@ -48,6 +48,7 @@ public class AppUserRelationController extends BaseController<AppUserRelationBiz
         Integer userid = Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
         return baseBiz.appBindRelation(userid,code);
         } catch (Exception e) {
+            e.printStackTrace();
             throw new BaseException(e);
         }
     }

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

@@ -19,6 +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
   </select>
 
 </mapper>
\ No newline at end of file

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

@@ -17,6 +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
   </select>
 
   <select id="selectByQuestionIdAndTime" resultType="com.xxfc.platform.im.entity.ImPraise" parameterType="com.xxfc.platform.im.dto.ImPraiseDto">