Merge branch 'master' of http://120.79.166.78:19005/zhongzheng-edu/saas_entrepot

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserCourseAnswerQueryBo.java

@@ -79,4 +79,6 @@ public class UserCourseAnswerQueryBo extends BaseEntity {
 	private String searchKey;
 	@ApiModelProperty("租户ID")
 	private String tenantId;
+	@ApiModelProperty("排序")
+	private Integer sort;
 }

zhongzheng-system/src/main/resources/mapper/modules/user/UserCourseAnswerMapper.xml

@@ -115,7 +115,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND g.business_id = #{businessId}
             </if>
         </if>
-        order by uca.update_time
+        <if test="sort != null and sort == 0">
+            order by uca.create_time desc
+        </if>
+        <if test="sort == null and sort == ''">
+            order by uca.create_time
+        </if>
     </select>
 
     <update id="delChildAnswer" parameterType="com.zhongzheng.modules.user.bo.UserCourseAnswerQueryBo" >