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

ruoyi-system/src/main/resources/mapper/system/GldryMapper.xml

@@ -36,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectGldryVo">
         select id, gl_place, room, jz_name, card_no, phone, area, street, community, unit, zr_time, zc_time, status,
                del_flag, create_by, create_time, update_by, update_time, remark, is_yx, building_no, house_no, unit_no,
-               committee,check_card from gldry
+               committee,check_card,other_zr_time from gldry
     </sql>
 
     <select id="selectGldryList" parameterType="Gldry" resultMap="GldryResult">