修改proto路径后,合并代码战斗补充

back_recharge
duhui 2020-12-24 10:09:51 +08:00
parent 645718da78
commit 98d95f187a
2 changed files with 2 additions and 9 deletions

View File

@ -3,12 +3,9 @@ package com.ljsd.jieling.logic.fight;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.googlecode.protobuf.format.JsonFormat; import com.googlecode.protobuf.format.JsonFormat;
import com.ljsd.jieling.logic.dao.root.User; import com.ljsd.jieling.logic.dao.root.User;
import com.ljsd.jieling.logic.fight.result.FightResult;
import com.ljsd.jieling.protocols.CommonProto;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap; import org.springframework.util.MultiValueMap;
import rpc.protocols.CommonProto;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -117,11 +114,7 @@ public class FightRecordLogic {
} }
public String getAll(int uid){ public String getAll(int uid){
<<<<<<< HEAD
MultiValueMap<Integer, String> valueMap = recordMap.getOrDefault(uid, new LinkedMultiValueMap<>()); MultiValueMap<Integer, String> valueMap = recordMap.getOrDefault(uid, new LinkedMultiValueMap<>());
=======
MultiValueMap<Integer, String> valueMap = recordMap.getOrDefault(uid,new LinkedMultiValueMap<>());
>>>>>>> master_test_hw
return valueMap.toString(); return valueMap.toString();
} }
} }

View File

@ -1,7 +1,7 @@
package com.ljsd.jieling.logic.fight.result; package com.ljsd.jieling.logic.fight.result;
import com.googlecode.protobuf.format.JsonFormat; import com.googlecode.protobuf.format.JsonFormat;
import com.ljsd.jieling.protocols.CommonProto; import rpc.protocols.CommonProto;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;