Merge branch 'master' of http://192.168.0.105:10010/r/jfptweb-publicSecurity

liuyg

2021-11-04 84b7f37a1f5113a91e34871975d176e61d1c007e

 src/views/article/article.vue

@@ -204,7 +204,7 @@
              label: "发布时间",
              prop: "createTime",
              type: "date",
              format: "yyyy-MM-dd HH:mm:ss",
              format: "yyyy-MM-dd",
              valueFormat: "yyyy-MM-dd HH:mm:ss",
            },
            {