Merge remote-tracking branch 'origin/manage' into manage

app/templates/v2/monthReportV2.1.html

@@ -388,12 +388,12 @@
     }
 
     .tss3 table tr th {
-      padding: 14px 0 14px 0;
+      padding: 12px 0 12px 0;
       background: #F1F1F1;
     }
 
     .tss3 table tr td {
-      padding: 14px 0 14px 0;
+      padding: 12px 0 12px 0;
     }
 
     .tss3 table tr td.gray {
@@ -1151,6 +1151,27 @@
         </div>
 
         <!-- 组合月度及累计回报率曲线 -->
+        {% if monthly_table_return|length >3 %}
+        <div class="page dtable" style="page-break-before:always;display: {{box4_section3}}">
+          <div class="page_title dcell">
+
+          </div>
+          <div class="page_head dcell">
+            <div class="dcell" style="display: {{logo_display}}">
+              <img src={{logo}} alt="" class="page_logo">
+            </div>
+            <div class="dcell" style="display: {{logo_display}}">
+              <div class="page_line"></div>
+            </div>
+            <div class="dcell" style="display: {{brand_name_display}}">
+              <div class="page_text">
+                {{brand_name}}<br>
+                  工作室
+              </div>
+            </div>
+          </div>
+        </div>
+        {%endif%}
         <div class="tss3" style="display: {{box2_section4}}">
           <div class="tss3_head dtable">
             <div class="tss3_title dcell">