Merge branch 'txb'

tangxbbaba

2021-08-14 f2061f5eaa12e2a6d6e3fb660e4a277dace6e283

 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;

}