Merge branch 'lal' into develop

src/main/resources/mapping/xcgl/XcglAssoGztztMapper.xml

@@ -85,7 +85,7 @@
 		<if test="gztszid != null"> and gztzt.gztszid = #{gztszid} </if>
 		<if test="fsType != null"> and gztzt.fs_type = #{fsType} </if>
 		<if test="qrType != null"> and gztzt.qr_type = #{qrType} </if>
-		<if test="xzzid != null"> and xzury.xzzid = #{xzzid} </if>
+		<if test="xzzid != null"> and gztzt.xzzid = #{xzzid} </if>
 		<if test="text != null and text != ''" >
 			and (emp.`name` like CONCAT('%',#{text},'%') or emp.emp_num = #{text})
 		</if>