Merge branch 'test' into 'master'

罗yu 元桥

2021-05-07 6c4db89ea8795d6be8431f698051e62bec9ec956

 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;

}