Merge remote-tracking branch 'origin/milestone-20250711-金币重构二期' into milestone-20250711-金币重构二期

src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java

@@ -131,6 +131,9 @@ public class GeneralServiceImpl implements GeneralService {
             List<String> list = Arrays.asList(market.split(","));
             //判断是否是总部
             if (list != null && list.contains("总部")) {
+
+
+
                 List<String> allMarkets = getMarket(); // 获取所有地区
                 allMarkets.add(0, "总部"); // 将“总部”添加到列表第一位
                 list = allMarkets; // 更新list

src/main/resources/application-dev.yml

@@ -35,9 +35,9 @@ spring:
   data:
     redis:
       database: 0
-      host: 18.143.76.3
-      port: 10703
-      password: Ngc0FYUTA6h3wC5J
+      host: localhost
+      port: 6379
+      password: 123456
 
       lettuce:
         pool:

src/main/resources/mapper/PermissionMapper.xml

@@ -92,7 +92,7 @@
                 )
             </if>
         </where>
-        order by admin.admin_status desc
+        order by admin.admin_status desc ,admin.update_time desc
     </select>
     <select id="getRole" resultType="com.example.demo.domain.entity.Role">
         select *