Merge remote-tracking branch 'remotes/origin/dev-1.1' into dev

# Conflicts:
#	src/main/java/com/chinaitop/depot/storage/utils/ExcelExporter.java

src/main/java/com/chinaitop/depot/storage/mapper/GrainSituationCardMapper.xml

@@ -850,7 +850,10 @@
       silo_grain_height = #{siloGrainHeight,jdbcType=DECIMAL},
       packaged_count = #{packagedCount,jdbcType=INTEGER},
       average_weight = #{averageWeight,jdbcType=DECIMAL},
-      check_record_ids = #{checkRecordIds,jdbcType=VARCHAR}
+      check_record_ids = #{checkRecordIds,jdbcType=VARCHAR},
+        in_financial_verification= #{inFinancialVerification,jdbcType=VARCHAR},
+      out_financial_verification=#{outFinancialVerification,jdbcType=VARCHAR},
+        excess_loss_quantity=#{excessLossQuantity,jdbcType=DECIMAL}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

src/main/java/com/chinaitop/depot/storage/utils/ExcelExporter.java

@@ -27,6 +27,7 @@ public class ExcelExporter {
             int rowIndex;
             rowIndex= 1;
             // 设置主标题并居中
+            Row titleRow = sheet.createRow(rowIndex++);
 
             Row headerRow = sheet.createRow(0);
             CellStyle headerCellStyle = workbook.createCellStyle();
@@ -103,6 +104,8 @@ public class ExcelExporter {
                 }
             }
 
+            rowIndex++; // 新增一行用于标题
+
             // 处理 GrainSituationCardWarehouseRecord 数据之前的表头
             rowIndex++; // 新增一行作为记录变更的表头行
             columnIndex = 0; // 重置列索引