Merge remote-tracking branch 'origin/master'

CeDo

2021-04-26 e90188e206ae5d6ee3f93cb6c481f79998e6b7ee

 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;

}