Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

101captain

2022-02-18 307ea3042f5b03e735772e5d3eaad8d5fc16b6ba

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

@@ -20,4 +20,8 @@
    private String logisticsCompany;
    @ApiModelProperty(value = "物流单号")
    private String logisticsNo;
    @ApiModelProperty(value = "操作账号", hidden = true)
    private String operUserAccount;
    @ApiModelProperty(value = "是否是管理员", hidden = true)
    private Boolean isAdmin;
}