wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2023-01-05 09:02:17 +08:00
parent de9210a34f 2d4595fd95
commit adee09981e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/common/controller/CensusController.java
View File

@ -811,6 +811,7 @@ public class CensusController {
Integer finalCounty_apply_month_change = county_apply_month_change; Integer finalCounty_apply_month_change = county_apply_month_change;
List<Map<String, Object>> result = new ArrayList<Map<String, Object>>() {{ List<Map<String, Object>> result = new ArrayList<Map<String, Object>>() {{
add(new LinkedHashMap<String, Object>() {{ add(new LinkedHashMap<String, Object>() {{
put("tip", "区市部门");
put("level", "county"); put("level", "county");
put("apply_sum", county_apply_sum); put("apply_sum", county_apply_sum);
put("resource_sum", county_resource_sum); put("resource_sum", county_resource_sum);
@ -820,6 +821,7 @@ public class CensusController {
put("apply_month_change", finalCounty_apply_month_change); put("apply_month_change", finalCounty_apply_month_change);
}}); }});
add(new LinkedHashMap<String, Object>() {{ add(new LinkedHashMap<String, Object>() {{
put("tip", "市级部门");
put("level", "municipal"); put("level", "municipal");
put("apply_sum", municipal_apply_sum); put("apply_sum", municipal_apply_sum);
put("resource_sum", municipal_resource_sum); put("resource_sum", municipal_resource_sum);