Merge branch 'dev' of http://111.203.232.171:8888/lee/chnmuseum-party

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -16,7 +16,7 @@
         <result column="update_time" property="updateTime"/>
         <result column="organ_name" property="organName"/>
         <result column="area_name" property="areaName"/>
-        <result column="user_name" property="userName"></result>
+        <result column="user_name" property="userName"/>
         <result column="permanent" property="permanent"/>
         <result column="effective_date" property="effectiveDate"/>
         <result column="exired_date" property="exiredDate"/>