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

blade-service/blade-los/src/main/java/org/springblade/los/excel/BoxAndLeadSealNoExcel.java

@@ -67,16 +67,15 @@ public class BoxAndLeadSealNoExcel implements Serializable {
 	@ExcelProperty(value = "毛重 (KGM)")
 	private BigDecimal grossWeight;
 	/**
-	 * 净重 (KGM)
-	 */
-	@ExcelProperty(value = "净重 (KGM)")
-	private BigDecimal netWeight;
-	/**
 	 * 体积 (CBM)
 	 */
 	@ExcelProperty(value = "体积 (CBM)")
 	private BigDecimal measurement;
-
+	/**
+	 * 净重 (KGM)
+	 */
+	@ExcelProperty(value = "净重 (KGM)")
+	private BigDecimal netWeight;
 	/**
 	 * 唛头
 	 */