Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-23 1d16cf86e7cff1f754576620aa27370b91df0004

 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;

}