代码合并

hx-sale/src/main/java/com/fjhx/sale/entity/contract/po/Contract.java

@@ -1,9 +1,7 @@
 package com.fjhx.sale.entity.contract.po;
 
-import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.Version;
 import com.fjhx.file.entity.ObsFile;
 import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
@@ -306,7 +304,7 @@ public class Contract extends BasePo {
     /**
      * 是否显示
      */
-    private String isShow;
+    private Integer isShow;
 
     /**
      * 原合同id
@@ -323,12 +321,6 @@ public class Contract extends BasePo {
      */
     private Integer versions;
 
-    /**
-     * 是否显示
-     */
-    private Integer isShow;
-
-
     @TableField(exist = false)
     private Long upId;