Merge remote-tracking branch 'origin/master'

DESKTOP-71BH0QO\L、ming

2021-04-26 dcd896a1e3d33eb641e1a76435d919a7de8186a9

 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;

}