解决代码冲突

f1b47eaa · caotao · 69c0e782 · f1b47eaa
Commit f1b47eaa authored Aug 21, 2023 by caotao
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

IdxBizPvPointVarCentralValue.java ...module/jxiop/biz/entity/IdxBizPvPointVarCentralValue.java +0 -8

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/IdxBizPvPointVarCentralValue.java
+++ b/amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/IdxBizPvPointVarCentralValue.java
@@ -147,14 +147,6 @@ public class IdxBizPvPointVarCentralValue{
 	@TableField("PROCESS3_MIN")
    private Double process3Min;

-    @TableField("PROCESS1_MAX")
-    private Double process1Max;
-
-    /**
-     *
-     */
-    @TableField("PROCESS1_MIN")
-    private Double process1Min;
    /**
     * 
     */