Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/resources/application.properties

@@ -11,9 +11,9 @@ mybatis-plus.check-config-location=true
 mybatis-plus.mapper-locations=classpath:mapper/*.xml
 mybatis-plus.type-aliases-package=cn.wisenergy.chnmuseum.party.model.**
 mybatis-plus.global-config.db-config.id-type=assign_id
-mybatis-plus.global-config.db-config.logic-delete-field=deleted
-mybatis-plus.global-config.db-config.logic-delete-value=1
-mybatis-plus.global-config.db-config.logic-not-delete-value=0
+#mybatis-plus.global-config.db-config.logic-delete-field=deleted
+#mybatis-plus.global-config.db-config.logic-delete-value=1
+#mybatis-plus.global-config.db-config.logic-not-delete-value=0
 mybatis-plus.global-config.banner=false
 mybatis-plus.configuration.lazy-loading-enabled=true
 mybatis-plus.configuration.aggressive-lazy-loading=false

src/main/resources/mapper/ExhibitionBoardMapper.xml

@@ -17,8 +17,8 @@
         <result column="video_content_id" property="videoContentId"/>
         <result column="ref_material_dir" property="refMaterialDir"/>
         <result column="audit_status" property="auditStatus"/>
-        <result column="is_published" property="isPublished"/>
-        <result column="is_deleted" property="isDeleted"/>
+        <result column="is_published" property="published"/>
+        <result column="is_deleted" property="deleted"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>