解决冲突

5ca006a7 · tangwei · d69df373 · e434f053 · 5ca006a7
Commit 5ca006a7 authored Oct 20, 2023 by tangwei
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

IdxBizFanWarningRuleSet.java ...boot/module/jxiop/biz/entity/IdxBizFanWarningRuleSet.java +3 -0

No files found.
--- a/amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWarningRuleSet.java
+++ b/amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizFanWarningRuleSet.java
@@ -120,4 +120,7 @@ public class IdxBizFanWarningRuleSet{
 	@TableField("EQUIPMENT_NAME")
    private String equipmentName;
+	@TableField("POINT_NAME")
+    private String pointName;
 }