Merge remote-tracking branch 'remotes/origin/test_excel610' into test

manailin

2021-06-21 26e9429512245f4b441b55c3ce59c21a5ebb570f

 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;

}