Merge remote-tracking branch 'origin/test' into test

yd-csf-service/src/main/resources/mappers/ExpectedFortuneMapper.xml

@@ -262,7 +262,7 @@
             </if>
             </if>
         </where>
         </where>
 
 
-        ORDER BY payable_no ASC, type ASC
+        ORDER BY fortune_type ASC, type ASC
         LIMIT #{pageSize} OFFSET #{offset}
         LIMIT #{pageSize} OFFSET #{offset}
     </select>
     </select>
 
 
@@ -383,7 +383,7 @@
             </if>
             </if>
         </where>
         </where>
 
 
-        ORDER BY payable_no ASC, type ASC
+        ORDER BY fortune_type ASC, type ASC
     </select>
     </select>
 
 
     <select id="queryListStatistics" resultType="com.yd.csf.service.vo.ExpectedFortuneStatisticsVO">
     <select id="queryListStatistics" resultType="com.yd.csf.service.vo.ExpectedFortuneStatisticsVO">