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

huanghongfa

2021-09-13 47b20dbb8f81f2a3ac113a7e209a8b4d1cb0146d

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopOrderQueryDTO.java

@@ -16,6 +16,12 @@
    @ApiModelProperty(value = "订单id")
    private Long orderId;

    @ApiModelProperty(value = "手机号",hidden = true)
    @ApiModelProperty(value = "手机号", hidden = true)
    private String phone;

    @ApiModelProperty(value = "操作账号", hidden = true)
    private String operUserAccount;

    @ApiModelProperty(value = "是否是管理员", hidden = true)
    private Boolean isAdmin = false;
}