Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5

src/pages/carouselFigure/advertisingList.jsx

@@ -55,13 +55,13 @@ const toEdit = (contentId) => () => {
       align: 'center',
       render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : '' }</span>
     },
-    {
-      title: '发布位置',
-      dataIndex: 'showPosition',
-      key: 'showPosition',
-      align: 'center',
-      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
-    },
+    // {
+    //   title: '发布位置',
+    //   dataIndex: 'showPosition',
+    //   key: 'showPosition',
+    //   align: 'center',
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : '' }</span>
+    // },
     {
       title: '发布时间',
       dataIndex: 'createDate',

src/pages/system/document/list.jsx

@@ -84,7 +84,7 @@ function body(props) {
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (createDate) => moment(createDate).format('YYYY-MM-DD h:mm:ss')
+      render: (createDate) => moment(createDate).format('YYYY-MM-DD HH:mm:ss')
     },
 
     {