Merge branch 'develop' into FOTON

This commit is contained in:
super_liu
2022-01-05 21:29:13 +08:00
@@ -87,7 +87,7 @@ public class WriteMaterialAfter implements TaskListener {
}
JSONObject object1 = object.getJSONObject("rh_pageData");
JSONObject object1 = object.getJSONObject("ch_pageData");
WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO();
if (StringUtils.isNotEmpty(object1.getString("comityName"))) {
wgWorkGroupShowDTO.setId(object1.getString("comityName"));