Merge branch 'feature/0427-school' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SchoolActivityServiceImpl.java

@@ -65,7 +65,7 @@ public class SchoolActivityServiceImpl extends ServiceImpl<SchoolActivityMapper,
         }
 
         // 设置机构信息
-        CooperationOrgan cooperationOrgan = cooperationOrganService.get(schoolActivity.getId());
+        CooperationOrgan cooperationOrgan = cooperationOrganService.get(schoolActivity.getCooperationOrganId());
         if (cooperationOrgan != null) {
             schoolActivityInfo.setCooperationOrganName(cooperationOrgan.getName());
             schoolActivityInfo.setCooperationOrganLogo(cooperationOrgan.getLogo());