Merge branch 'develop_master' into FOTON

This commit is contained in:
Superman_Main
2021-12-08 21:24:36 +08:00
@@ -66,6 +66,7 @@ public class SarStandItemsController extends BaseController<SarStandItems> {
}else { }else {
map.put(s,id.get(i)); map.put(s,id.get(i));
} }
i++;
} }
List<SarStandItemsDto> ItemDto = new ArrayList<>(); List<SarStandItemsDto> ItemDto = new ArrayList<>();
map.entrySet().forEach(stringStringEntry -> { map.entrySet().forEach(stringStringEntry -> {