Merge remote-tracking branch 'origin/test_screen' into test_screen

huanghongfa

2021-06-17 ce4b6a8e4c11a869f5707eef053488c62fb97eed

 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;

}