Merge remote-tracking branch 'origin/master'

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/enterpriseinfo/mapper/xml/EnterpriseInfoMapper.xml

@@ -472,9 +472,9 @@
     </select>
 
     <select id="queryByUserNameList" resultType="com.jeeplus.enterpriseinfo.service.dto.EnterpriseInfoDTO">
-        SELECT id,name,lxr,phone,bz5,bz6,des1
+        SELECT id,name,lxr,phone,des13,des14,des1
         FROM ly_enterprise_info
-        where del_flag = 0 and bz6 = #{loginName};
+        where del_flag = 0 and des13 = #{loginName};
     </select>
 
 </mapper>

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/lyservice/controller/LyServiceController.java

@@ -63,7 +63,7 @@ public class LyServiceController {
 		UserDTO userDTO = UserUtils.getCurrentUserDTO();
 		//		//挂钩干部（能看到对应企业）
 		if(userDTO.getRoleIds().equals("1910141956174053377")){
-			queryWrapper.eq ("qy.bz6", userDTO.getLoginName() ); // 排除已经删除
+			queryWrapper.eq ("qy.des13", userDTO.getLoginName() ); // 排除已经删除
 		}
 		IPage<LyServiceDTO> result = lyServiceService.findPage (page, queryWrapper);
 		return ResponseEntity.ok (result);

jp-console/jeeplus-module/ly/src/main/java/com/jeeplus/lyservice/mapper/xml/LyServiceMapper.xml

@@ -18,8 +18,8 @@
 		qy.lxr AS "qy.lxr",
 		qy.phone AS "qy.phone",
 		qy.des1 AS "qy.des1",
-		qy.bz5 AS "qy.bz5",
-		qy.bz6 AS "qy.bz6"
+		qy.des14 AS "qy.des14",
+		qy.des13 AS "qy.des13"
 
 	</sql>