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

Merge branch 'dev' into docker_package

This commit is contained in:
wangliwen 2022-07-12 14:56:46 +08:00
parent 923bf8b1ca 9426860495
commit 24cb34d98e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,9 @@ public class CensusController {
{ {
put("provide", type); put("provide", type);
put("deptId", deptId); put("deptId", deptId);
put("deptName", deptDTO.getName()); if (deptDTO != null) {
put("deptName", deptDTO.getName());
}
} }
}); });
}); });