Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-27 db9d95db6f25f95cbc614525adef7dbdeae6478c

 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;

}