Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into txb

tangxiaobao

2021-07-14 c64da5152d32c366eecfb20b3fdc023be1d27681

 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;
}