Skip to content

M
midjourney-proxy
Commit ec45b6fe by 田超
Options

Merge branch 'feature/1003786' into 'master' 

bug:[none]合并

See merge request rays/pcloud-book!1066
parents cafedbdb 57909388
Showing with 1 additions and 3 deletions
pcloud-facade-book/src/main/java/com/pcloud/book/book/dto/BookDto.java
...@@ -746,7 +746,6 @@ public class BookDto extends BaseDto { ...@@ -746,7 +746,6 @@ public class BookDto extends BaseDto {
@ApiModelProperty("答案订阅状态") @ApiModelProperty("答案订阅状态")
private Boolean subscribeState; private Boolean subscribeState;
<<<<<<< HEAD
@ApiModelProperty("版次") @ApiModelProperty("版次")
private String edition; private String edition;
...@@ -758,8 +757,7 @@ public class BookDto extends BaseDto { ...@@ -758,8 +757,7 @@ public class BookDto extends BaseDto {
this.edition = edition; this.edition = edition;
} }
=======
>>>>>>> d6624c2c31b9ef3ce5d6f2d09aa9106dde275d5f
private BookAdviserDto bookAdviserDto; private BookAdviserDto bookAdviserDto;
public BookAdviserDto getBookAdviserDto() { public BookAdviserDto getBookAdviserDto() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment