Merge branch 'test_future_wangge' into test

CeDo

2021-06-08 d4b9ab5678abe6835e26d8984a5c10dbb6092f30

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