Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -5,6 +5,7 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -112,6 +113,7 @@ public class TaBuilding implements Serializable {
     /**
      * 显示顺序
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     private Integer orderNo;
 
     /**

src/main/resources/mapper/TaBuildingMapper.xml

@@ -254,7 +254,7 @@
             AND t.is_main = 1
         GROUP BY
             t.building_id
-        ORDER BY t.order_no
+        ORDER BY t.order_no desc
     </select>
 
 </mapper>