Merge branch 'west_bigscreen_dev' into 'master'

罗元桥

2021-12-14 ecde7a30a43e3d45be2f0f9e271d0abf02c7d58e

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

@@ -16,7 +16,7 @@
    @ApiModelProperty(value = "订单id")
    private Long orderId;

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

    @ApiModelProperty(value = "操作账号", hidden = true)