Merge remote-tracking branch 'origin/master'

src/main/resources/templates/admin/project_approve.ftl

@@ -142,6 +142,10 @@
         .am-tabs.palm-tabs.outer>.am-tabs-bd.palm-tabs-bd{
             overflow: visible !important;
         }
+        .am-tab-panel .am-tabs-bd.palm-tabs-bd{
+            overflow: visible
+        }
+
     </style>
     <div id="printContainer"></div>
     <div class="project_approve" id="contentContainer">

src/main/resources/templates/admin/project_budget_edit.ftl

@@ -82,6 +82,10 @@
         overflow-y:hidden;
     }
 
+   /* 解决页面滚动条缩小页面，内容靠右显示问题 */
+   .am-form .am-tabs-bd.palm-tabs-bd{
+       overflow: visible;
+   }
 </style>
 
 <div class="project_budget">