Merge branch 'txb'

tangxbbaba

2021-08-14 0c8c1b9423d9a1d2dc16649ed22267145aa589a3

 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;

}