Merge branch 'master' of http://118.31.7.2:3000/tzjy-code/digital_marketing into de'v

src/main/resources/mappers/StuUploadExcelUserMapper.xml

@@ -958,9 +958,13 @@
     </foreach>
   </insert>
   <select id="selectDistModuleName" parameterType="java.lang.String" resultType="java.lang.String">
-    SELECT DISTINCT module
-    FROM stu_upload_excel_user
-    WHERE user_id = #{userId}
+    SELECT module
+    FROM (
+      SELECT DISTINCT module, create_time
+      FROM stu_upload_excel_user
+      WHERE user_id = #{userId}
+      ) AS subquery
+    ORDER BY subquery.create_time ASC
   </select>
   <select id="selectByString" resultType="java.lang.String">
     select DISTINCT step_eleven_c from stu_upload_excel_user where user_id = #{userId} and module=#{tableName}