bug:[none]合并

pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java

@@ -746,7 +746,6 @@ public class BookDto extends BaseDto {
     @ApiModelProperty("答案订阅状态")
     private Boolean subscribeState;
 
-<<<<<<< HEAD
     @ApiModelProperty("版次")
     private String edition;
 
@@ -758,8 +757,7 @@ public class BookDto extends BaseDto {
         this.edition = edition;
     }
 
-=======
->>>>>>> d6624c2c31b9ef3ce5d6f2d09aa9106dde275d5f
+
     private BookAdviserDto bookAdviserDto;
 
     public BookAdviserDto getBookAdviserDto() {