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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -15,10 +15,12 @@
 * @Version 1.0
 **/
@Data
@ApiModel("订单发货信息")
@ApiModel("订单配送信息")
public class ComShopOrderDeliverDTO {
    @ApiModelProperty(value = "订单号")
    private String orderNo;
    @ApiModelProperty(value = "订单ID")
    private Long orderId;
    @ApiModelProperty(value = "操作账号", hidden = true)
    private String operUserAccount;
    @ApiModelProperty(value = "是否是管理员", hidden = true)
    private Boolean isAdmin = false;
}