Merge branch 'master' of 60.1.1.230:backend/jieling_server
commit
25df23fd53
|
@ -341,7 +341,7 @@ public class ActivityLogic {
|
|||
int startTime = (int) (sGlobalActivity.getTimeLong(createTime, 1) / 1000);
|
||||
int endTime = (int) (sGlobalActivity.getTimeLong(createTime, 2) / 1000);
|
||||
List<CommonProto.ActivityInfo.MissionInfo> missionInfos = abstractActivity.getAllMissInfo(activityMission);
|
||||
fBuilder.addActivityInfo(CommonProto.ActivityInfo.newBuilder().setActivityId(activityId).addAllMission(missionInfos).setStartTime(startTime).setEndTime(endTime).setReallyOpen(activityMission.getOpenType()).build());
|
||||
fBuilder.addActivityInfo(CommonProto.ActivityInfo.newBuilder().setValue(activityMission.getValue()).setActivityId(activityId).addAllMission(missionInfos).setStartTime(startTime).setEndTime(endTime).setReallyOpen(activityMission.getOpenType()).build());
|
||||
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue