Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-27 5c70b1f8fd59e1d35014c08d63a28f58b7aa9249

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

@@ -30,4 +30,7 @@

    @ApiModelProperty(value = "处理人", hidden = true)
    private Long updatedBy;

    @ApiModelProperty(value = "被禁用商家关联用户id", hidden = true)
    private List<Long> userIds;
}