Merge remote-tracking branch 'origin/master'

src/main/resources/mybatis/mapper/crgs/punish/TbIlcPunInfoQueryMapper.xml

@@ -96,6 +96,8 @@
 
     <select id="findById" resultType="com.chinaweal.aiccs.crgs.punish.entity.TbIlcPunInfoQuery">
         select <include refid="As_Base_Column_List"/> from case_pub_nbaseinfo where ACTYPE = '1' and CASEID = #{id}
+        union all
+        select <include refid="As_Base_Column_List"/> from AICCS.QG_CASE_PUB_NBASEINFO where ACTYPE = '1' and CASEID = #{id}
     </select>
 
     <!-- 行政处罚记录UNION查询（本省+外省） -->