Merge remote-tracking branch 'outside/master' into release-sy-v1.0.0

shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfGltzController.java

@@ -53,7 +53,7 @@ public class BsSgcDfGltzController extends BaseController
     @ApiOperation("堤防管理体制列表")
     public IPage list(@RequestBody SearchParam<BsSgcDfGltz> sp)
     {
-        return bsSgcDfGltzService.selectPage(sp);
+        return bsSgcDfGltzService.getPage(sp);
     }
 
     /**

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfDsjMapper.xml

@@ -23,7 +23,7 @@
         <result property="dischargeVolume" column="discharge_volume"/>
         <result property="abnormalCondition" column="abnormal_condition"/>
         <result property="conclusion" column="conclusion"/>
-        <result property="Supervise" column="Supervise"/>
+        <result property="supervise" column="Supervise"/>
     </resultMap>
 
 

shuili-system/src/main/resources/mapper/yg/df/BsSgcDfGltzMapper.xml

@@ -12,7 +12,7 @@
 
     </sql>
 
-    <resultMap id="col" type="BsSgcDfYaxx">
+    <resultMap id="col" type="BsSgcDfGltz">
         <id property="id" column="id"/>
         <result property="dikeCode" column="dike_code"/>
         <result property="dikeName" column="dike_name"/>

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzDsjMapper.xml

@@ -23,7 +23,7 @@
         <result property="dischargeVolume" column="discharge_volume"/>
         <result property="abnormalCondition" column="abnormal_condition"/>
         <result property="conclusion" column="conclusion"/>
-        <result property="Supervise" column="Supervise"/>
+        <result property="supervise" column="Supervise"/>
     </resultMap>
 
 

shuili-system/src/main/resources/mapper/yg/sz/BsSgcSzGltzMapper.xml

@@ -12,7 +12,7 @@
 
     </sql>
 
-    <resultMap id="col" type="BsSgcSzYaxx">
+    <resultMap id="col" type="BsSgcSzGltz">
         <id property="id" column="id"/>
         <result property="wagaCode" column="waga_code"/>
         <result property="wagaName" column="waga_name"/>