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

huanghongfa

2021-07-28 098b507166a2b23f0256d5c4f097e7f05f11e9be

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

@@ -18,4 +18,10 @@

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

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

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