Merge remote-tracking branch 'origin/master'

src/main/java/org/rcisoft/business/cmsApplication/controller/CmsApplicationController.java

@@ -54,7 +54,7 @@ public class CmsApplicationController extends CyPaginationController<CmsApplicat
     @Operation(summary = "删除报名表", description = "删除报名表")
     @Parameters({@Parameter(name = "businessId", description = "businessId", required = true)})
     @DeleteMapping("/delete/{businessId:\\w+}")
-    public CyResult delete(@PathVariable Integer businessId, @RequestBody CmsApplication cmsApplication) {
+    public CyResult delete(@PathVariable Integer businessId, @RequestBody  CmsApplication cmsApplication) {
         cmsApplication.setBusinessId(businessId);
         CyPersistModel data = cmsApplicationServiceImpl.remove(cmsApplication);
         return CyResultGenUtil.builder(data,

src/main/java/org/rcisoft/business/opmArticle/service/impl/OpmArticleServiceImpl.java

@@ -285,6 +285,10 @@ public class OpmArticleServiceImpl extends ServiceImpl<OpmArticleRepository, Opm
             List<ArticleCommentVO> comment = baseMapper.selectArticleCommentCount(article);
             //修改动态
             article.setCommentCount(comment.size());//修改评论数
+            //驳回原因
+            if (opmArticle.getRemarks()!= null){
+                article.setRemarks(opmArticle.getRemarks());
+            }
             int line = baseMapper.updateById(article);
             //修改动态所有评论审核状态
             //修改子表的评论数 给父级评论数+1