Merge remote-tracking branch 'origin/0815-通过销项获取当前组织最新税号' into release

# Conflicts:
#	dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysCompanyEntity.java
#	dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml

dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml

@@ -74,7 +74,7 @@
     </update>
 
     <select id="getOrgsByUserId" parameterType="long" resultType="com.dxhy.admin.sys.entity.SysCompanyEntity">
-        select dept.org_code as companyCode,dept.name as companyName,dept.dept_id as deptId,dept.taxno taxno from sys_user_org org
+        select dept.org_code as companyCode,dept.name as companyName,dept.dept_id as deptId,dept.taxno gfsh from sys_user_org org
         inner join sys_dept dept on org.dept_id = dept.dept_id
         where org.userid = #{userId}
     </select>