Merge branch 'test_screen' into 'test'

罗元桥

2021-06-22 7df36d4bf09248b6d4f82ef52b5cb2d197619bed

 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;

}