Merge remote-tracking branch 'origin/master'

src/main/java/cn/wisenergy/chnmuseum/party/model/LearningContent.java

@@ -66,7 +66,7 @@ public class LearningContent implements Serializable {
     private String learningProjectId;
 
     @ApiModelProperty("创建者")
-    @TableField("creator_name")
+    @TableField(value = "creator_name", fill = FieldFill.INSERT)
     private String creatorName;
 
     @ApiModelProperty("审核状态")

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java

@@ -117,6 +117,13 @@ public class ExhibitionBoardCatController extends BaseController {
 
         //todo 删除中间关联表
 
+
+
+
+
+
+
+
         return getSuccessResult();
     }