Merge branch 'master' of http://www.sysuimars.com:3000/kelei12399/foster

admin/src/main/java/com/flyer/foster/entity/FosterRecord.java

@@ -39,7 +39,7 @@ public class FosterRecord implements Serializable {
     private Integer appUserId;
 
     /**
-     * gardenId
+     * 果园id
      */
     private Integer gardenId;
 

admin/src/main/java/com/flyer/foster/entity/Garden.java

@@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.Version;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -39,6 +41,11 @@ public class Garden implements Serializable {
     private String name;
 
     /**
+     * 飞鸟看园果园id
+     */
+    private Integer birdseyeGardenId;
+
+    /**
      * 用户id
      */
     private Integer userId;

admin/src/main/resources/mysql/ddl/init-table.sql

@@ -295,4 +295,7 @@ alter table tb_app_user
     add column garden_id int default 0 comment '最新进入果园id' after id;
 
 alter table tb_foster_record
-    add column garden_id int default 0 comment '果园id' after app_user_id;
+    add column garden_id int default 0 comment '果园id' after app_user_id;
+
+alter table tb_garden
+    add column birdseye_garden_id int default 0 comment '飞鸟看园果园id' after name;