解决冲突

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java

@@ -65,11 +65,8 @@ public class CommonPageParamUtil {
 				param.setIsRemoveShield(toString(queryRequests.get(i).getValue()));
 			} else if("isRemovedFire".equals(name)){
 				param.setIsRemovedFire(toString(queryRequests.get(i).getValue()));
-<<<<<<< HEAD
 			} else if("bizOrgCode".equals(name)){
 				param.setBizOrgCode(toString(queryRequests.get(i).getValue()));
-		}
-=======
 			} else if("equipmentCode".equals(name)){
 				param.setEquipmentCode(toString(queryRequests.get(i).getValue()));
 			} else if("specificIndexKey".equals(name)){
@@ -77,7 +74,6 @@ public class CommonPageParamUtil {
 			} else if("indexTypeCode".equals(name)){
 				param.setIndexTypeCode(toString(queryRequests.get(i).getValue()));
 			}
->>>>>>> develop_station
 		}
 		if(commonPageable !=null){
 			param.setPageNumber(commonPageable.getPageNumber());