Merge remote-tracking branch 'origin/master-zz' into master-zz

src/main/resources/mapper/TbXwCbajMapper.xml

@@ -52,6 +52,6 @@
     </select>
 
     <select id="getZtryDetail" parameterType="java.lang.String" resultType="java.util.Map">
-        select BGBH,XM,ZJHM from TB_YW_ZTRY_XSBG where XXSC_PDBZ = 0 and xxzjbh = #{xxzjbh}
+        select BGBH,XM,ZJHM from TB_RY_XSBG where XXSC_PDBZ = 0 and xxzjbh = #{xxzjbh}
     </select>
 </mapper>
\ No newline at end of file