解决冲突

src/main/java/com/sqx/modules/errand/entity/TbIndent.java

@@ -267,9 +267,5 @@ public class TbIndent implements Serializable {
     @TableField(exist = false)
     private String stationName;
 
-    //	站点名称
-    @TableField(exist = false)
-    private String stationName;
-
     public TbIndent() {}
 }