Merge remote-tracking branch 'origin/master'

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.css

@@ -1,7 +1,3 @@
-* {
-  margin: 0;
-  padding: 0;
-}
 .knowledgeFieldCon {
   position: relative;
   background: #f6f7fb;

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/css/knowledgeField.less

@@ -1,7 +1,3 @@
-* {
-  margin: 0;
-  padding: 0;
-}
 .knowledgeFieldCon {
   position: relative;
   background: #f6f7fb;

fhKeeper/formulahousekeeper/webttkuaiban/src/main/resources/static/knowledgeDetails.ftl

@@ -6,9 +6,9 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <meta name="keywords"
-    content="工时管理，工时统计，工时填报，项目成本统计，生产工时管理系统，工时成本管理，工时管理软件，研发工时管理系统，企业工时管理系统，项目工时统计，项目工时统计软件，项目工时统计系统，工时统计系统，工时统计表" />
-  <meta name="description" content="工时管家提供专业的工时填报和统计报表。支持PC和手机端。可按项目，部门，岗位等多维度统计成本。" />
-  <title>工时管家-专注工时管理，手机移动填报，核算项目投入人力成本，企业IPO利器！</title>
+    content="${article.categoryNames}" />
+  <meta name="description" content="${article.profile}" />
+  <title>${article.title}</title>
   <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
   <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,400i,700&display=swap&subset=latin-ext"
     rel="stylesheet">