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

xyh

2021-06-23 d01be9f1ec9a393818ea64deca3cbe7fa9372e08

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopOperLogVO.java

@@ -78,4 +78,7 @@
    @ApiModelProperty("用户ID")
    private Long userId;

    @ApiModelProperty("用户名")
    private String userName;

}