Merge branch 'dev' into 'main'

Dev

See merge request !184

ruoyi-system/src/main/java/com/ruoyi/system/domain/grid/GridRegion.java

@@ -111,6 +111,12 @@ public class GridRegion implements Serializable {
 
     private String pId;
 
+    private String detail;
+
+    public String getDetail(){return detail;}
+
+    public void setDetail(String detail){this.detail = detail;}
+
     public String getpName(){return pName;}
 
     public void setpName(String pName){this.pName = pName;}

ruoyi-system/src/main/resources/mapper/grid/GridRegionMapper.xml

@@ -26,6 +26,7 @@
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.ruoyi.system.domain.grid.GridRegion">
     <result column="wg_coordinate" jdbcType="LONGVARCHAR" property="wgCoordinate" />
+    <result column="detail" jdbcType="VARCHAR" property="detail" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -91,7 +92,7 @@
     ylzd2, ylzd3, ylzd4, ylzd5, wg_purpose, status
   </sql>
   <sql id="Blob_Column_List">
-    wg_coordinate
+    wg_coordinate,detail
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="com.ruoyi.system.domain.grid.GridRegionExample" resultMap="ResultMapWithBLOBs">
     select