fix: fix conflict

hootrhino · Mar 22, 2024 · 9cc2555 · 9cc2555
1 parent f2d7ba2
commit 9cc2555
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/component/rulex_api_server/apis/device_modbus_data_sheet_api.go b/component/rulex_api_server/apis/device_modbus_data_sheet_api.go
@@ -97,8 +97,8 @@ func ModbusPointsExport(c *gin.Context, ruleEngine typex.RuleX) {
 			fmt.Sprintf("%d", *record.SlaverId),
 			fmt.Sprintf("%d", *record.Address),
 			fmt.Sprintf("%d", *record.Quantity),
-			record.Type,
-			record.Order,
+			record.DataType,
+			record.DataOrder,
 			fmt.Sprintf("%f", *record.Weight),
 		}
 		cell, _ = excelize.CoordinatesToCellName(1, idx+2)