Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2023-08-23 ed35e27fd377db24fd5ff83848824f6525f1382c

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java

@@ -270,4 +270,8 @@

    @ApiModelProperty("商家id")
    private Long storeIdId;

    @ApiModelProperty("角色id")
    private String roleId;

}