Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/option/dao/entity/MaintenanceOption.java

@@ -28,7 +28,7 @@ public class MaintenanceOption implements Serializable {
      * 保养项目ID
      */
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     /**
      * 维保公司id