Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-08-05 d769a8683ea6f2ecbc451da71ca3079c6765a99d

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDiscussOptionDO.java

@@ -34,6 +34,11 @@
    private String optionContent;

    /**
     * 选项图片url
     */
    private String optionUrl;

    /**
     * create_at
     */
    @TableField(fill = FieldFill.INSERT)