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

src/main/resources/mapper/TJksbglOracleMapper.xml

@@ -5,7 +5,7 @@
 
     <select id="countJKsb" resultType="int">
         select count(*)
-        from SYX_JWYSJ.T_JKSBGL
+        from SYX_JWSZPT.T_JKSBGL
     </select>
 
     <resultMap id="BaseResultMap" type="com.ssf.mysqloracletest.domain.TJksbglOracle">
@@ -75,7 +75,7 @@
 
     <select id="getJKsbList" parameterType="java.util.Map" resultMap="BaseResultMap">
         SELECT t2.*
-        FROM (SELECT ROWNUM rn, t1.* FROM (SELECT * FROM SYX_JWYSJ.T_JKSBGL) t1 WHERE ROWNUM<![CDATA[ <= ]]> ${rowEnd}) t2
+        FROM (SELECT ROWNUM rn, t1.* FROM (SELECT * FROM SYX_JWSZPT.T_JKSBGL) t1 WHERE ROWNUM<![CDATA[ <= ]]> ${rowEnd}) t2
         WHERE t2.rn <![CDATA[ >= ]]> ${rowStart}
     </select>