Merge branch 'zzj' of http://182.151.2.19:9380/root/zhihuishequ into zzj

huanghongfa

2021-08-19 29c3367d8c8f9777bde6a86fa26c86d19a35bc07

 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;

}