Merge remote-tracking branch 'origin/master'

jiangping

2024-07-17 2cbd23d061be5076b86771750bf17615bbecb57d

 server/service/src/main/java/com/doumee/biz/zbom/model/zhongtai/ZTContentListRequest.java

@@ -26,8 +26,8 @@
    @ApiModelProperty(value = "内容查询条件")
    private String query;

    @ApiModelProperty(value = "标签")
    private String tagCodes;
//    @ApiModelProperty(value = "标签")
//    private String tagCodes;

    @ApiModelProperty(value = "排序方式 NORMAL - 默认；HOT - 最热；LATEST - 最新；")
    private String sortType;