zhangqiankun %!s(int64=3) %!d(string=hai) anos
pai
achega
c00f0b372d

+ 2 - 0
src/main/java/com/persagy/proxy/object/controller/AdmEquipmentController.java

@@ -326,6 +326,8 @@ public class AdmEquipmentController {
 	        			xssfRow.createCell(j);
 	        			if (j == 0) {
 	        				this.setColor(workbook, 252, 255, 77, xssfRow.getCell(j));
+						} else {
+							this.setColor(workbook, 77, 178, 255, xssfRow.getCell(j));
 						}
 	        			continue;
 					}

+ 2 - 2
src/main/java/com/persagy/proxy/report/model/EquipmentExcel.java

@@ -31,11 +31,11 @@ public class EquipmentExcel {
 
 	@ColumnWidth(20)
 	@ExcelProperty(value = "设备本地名称", index=2)
-	private String localId;
+	private String localName;
 
 	@ColumnWidth(20)
 	@ExcelProperty(value = "设备本地编码", index=3)
-	private String localName;
+	private String localId;
 	
 	@ColumnWidth(50)
 	@ExcelProperty(value = "BIMID", index=4)