Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/dxf

src/com/engine/organization/mapper/version/CompanyVersionMapper.xml

@@ -52,7 +52,7 @@
         select * from (select * from hrmdepartment_version where departmentid=#{departmentid} order by version desc) where rownum=1
     </select>
     <select  id="getMaxDeptVersion" resultType="com.engine.organization.entity.version.HrmDepartmentVersion" databaseId="sqlserver">
-        select top  1 * from hrmsubcompany_version where departmentid=#{departmentid} order by version desc
+        select top  1 * from hrmdepartment_version where departmentid=#{departmentid} order by version desc
     </select>
 
     <insert id="insertHrmDeptVersion">