fix：合并1.0

src/main/java/com/lqkj/link/module/zone/service/ZoneInfoService.java

@@ -384,7 +384,7 @@ public class ZoneInfoService {
 
         ZoneInfo zoneInfo = new ZoneInfo(null, userInfo.getUserId(), name, template == null ? new JSONObject(JSON.parseObject("{\"rotation\":{\"x\":0,\"y\":0.4383658766746521,\"z\":0,\"w\":0.8987966179847717},\"translation\":{\"x\":-820.947265625,\"y\":0,\"z\":955.6719360351563},\"scale3D\":{\"x\":1,\"y\":1,\"z\":1}}")) : template.getInitLocation(),
                 template == null ? null : template.getThumbnail(), 0, new Date(), 0, 0,
-                null, null, 0,null);
+                null, null, 0,0, null);
         ZoneInfo newInfo = zoneInfoRepository.save(zoneInfo);
         GeometryFactory geometryFactory = new GeometryFactory();
         if (templateId != null) {

src/main/resources/db/migration/V3__2.0.0.sql

@@ -1,25 +1,3 @@
-<<<<<<< HEAD
-alter table zone_info add column like_count INT4 default 0;
-comment on column zone_info.like_count is
-'点赞数: like_count';
-create table Likes (
-    id SERIAL not null,
-    user_id INT4 not null,
-    zone_id INT4 not null,
-    create_time TIMESTAMP default current_timestamp,
-    constraint PK_LIKES primary key (id)
-);
-comment on table Likes is
-'点赞表: Likes';
-comment on column Likes.id is
-'id: id';
-comment on column Likes.user_id is
-'用户id: user_id';
-comment on column Likes.zone_id is
-'点赞的作品id: zone_id';
-comment on column Likes.create_time is
-'点赞时间: create_time'
-=======
 alter table geom_info
     add column if not exists pics varchar(1024),
     add column if not exists video_url varchar(1024),
@@ -37,5 +15,4 @@ comment on column geom_info.navigation_end is '导航终点：navigation_end';
 
 
 ALTER TABLE model_info
-ALTER COLUMN texture_path TYPE VARCHAR(5000);
->>>>>>> 2ea1012e32fc18bb55a79461c9862f040d41294a
+ALTER COLUMN texture_path TYPE VARCHAR(5000);

src/main/resources/db/migration/V4__2.0.1.sql

@@ -1,7 +0,0 @@
-alter table share_info add column shared_user_id INT4;
-comment on column share_info.shared_user_id is
-'被分享人id: shared_user_id';
-
-alter table notice_info add column zone_id INT4;
-comment on column notice_info.zone_id is
-'作品id: zone_id';

src/main/resources/db/migration/V6__2.0.1.sql

@@ -0,0 +1,28 @@
+alter table zone_info add column like_count INT4 default 0;
+comment on column zone_info.like_count is
+'点赞数: like_count';
+create table Likes (
+                       id SERIAL not null,
+                       user_id INT4 not null,
+                       zone_id INT4 not null,
+                       create_time TIMESTAMP default current_timestamp,
+                       constraint PK_LIKES primary key (id)
+);
+comment on table Likes is
+'点赞表: Likes';
+comment on column Likes.id is
+'id: id';
+comment on column Likes.user_id is
+'用户id: user_id';
+comment on column Likes.zone_id is
+'点赞的作品id: zone_id';
+comment on column Likes.create_time is
+'点赞时间: create_time';
+
+alter table share_info add column shared_user_id INT4;
+comment on column share_info.shared_user_id is
+'被分享人id: shared_user_id';
+
+alter table notice_info add column zone_id INT4;
+comment on column notice_info.zone_id is
+'作品id: zone_id';