Merge branch 'test_elder_cedoo' into 'test'

罗元桥

2021-06-10 b8d265761ef169cc79e4498f482e0f195af8bab5

 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;

}