Merge remote-tracking branch 'origin/develop_1' into develop_1

This commit is contained in:
Wanghong
2021-07-21 17:59:20 +08:00
@@ -137,13 +137,6 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
}
String completedString = builder.delete(builder.length()-1,builder.length()).toString();
list1.setCountryArea(completedString);
}else {
for (Map<String,String> map1:arr) {
if (map1.get("value").equals(list1.getCountryArea())){
list1.setCountryArea(map1.get("label"));
break;
}
}
}
}
userIPage.setRecords(list);