Merge remote-tracking branch 'origin/master' into master

src/main/java/org/rcisoft/business/opmArticle/controller/OpmArticleController.java

@@ -41,7 +41,7 @@ public class OpmArticleController extends CyPaginationController<OpmArticle> {
     @CyOpeLogAnno(title = "system-opmArticle管理管理-新增opmArticle管理", businessType = CyLogTypeEnum.INSERT)
     @Operation(summary="添加opmArticle管理", description="添加opmArticle管理")
     @PostMapping(value = "/add")
-    public CyResult add(@Valid OpmArticle opmArticle, BindingResult bindingResult) {
+    public CyResult add(@Valid @RequestBody OpmArticle opmArticle, BindingResult bindingResult) {
         CyPersistModel data = opmArticleServiceImpl.persist(opmArticle);
         return CyResultGenUtil.builder(data,
             CyMessCons.MESSAGE_ALERT_SUCCESS,

src/main/java/org/rcisoft/business/opmArticle/entity/OpmArticle.java

@@ -59,6 +59,13 @@ public class OpmArticle extends CyIdIncreEntity<OpmArticle> {
       */
      private Integer topicId;
 
+     /**
+      * @desc 图片Id
+      * @column picture_id
+      * @default
+      */
+     private String pictureId;
+
      /**
       * 图片地址
       */