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

# Conflicts:
#	coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml

coolstore-partner-dao/src/main/resources/mapper/LineInfoMapper.xml

@@ -442,6 +442,7 @@
         #{wantShopAreaId}
       </foreach>
     </if>
+    order by a.id desc
   </select>
 
 
@@ -476,6 +477,7 @@
         #{wantShopAreaId}
       </foreach>
     </if>
+    order by a.id desc
   </select>
 
 
@@ -513,6 +515,7 @@
     <if test="request.lastInvestmentManagerUserId != null and request.lastInvestmentManagerUserId != ''">
       and investment_manager = #{request.lastInvestmentManagerUserId}
     </if>
+    order by id desc
   </select>
   
   <update id="batchUpdateInterviewWorkflowStage">

coolstore-partner-dao/src/main/resources/mapper/PointInfoMapper.xml

@@ -98,6 +98,7 @@
         #{regionId}
       </foreach>
     </if>
+    order by id desc
   </select>
     <select id="getSelectedShopNum" resultType="com.cool.store.dto.point.LineCountDTO">
       select
@@ -187,6 +188,7 @@
           #{regionId}
         </foreach>
       </if>
+    order by id desc
   </select>
     <select id="getDataByShopIdAndLineId" resultType="com.cool.store.entity.PointInfoDO">
       SELECT