Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 2bff00bae9369d70d29acde8fea1fd8192ada033

 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;

}