Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-20 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageComOpsHouseDTO.java

@@ -42,7 +42,7 @@
    @ApiModelProperty(value = "发布人id")
    private Long userId;

    @ApiModelProperty(value = "状态  0待审核 1已上架 2已驳回 3已下架 4待审核和已驳回")
    @ApiModelProperty(value = "状态  0待审核 1已上架 2已驳回 3已下架 4待审核和已驳回 5已上架和已下架")
    private Integer status;

    @ApiModelProperty("小程序使用 1 表示查询我的")
@@ -60,7 +60,7 @@
    private Integer priceOrder;

    @ApiModelProperty(value="发布人姓名")
    private String userRealName;
    private String userName;
    @ApiModelProperty(value="联系方式")
    private String mobile;