Merge branch 'refs/heads/master' into xin

xin

2025-10-17 ab0637e981ab4c85120ccde35ee24ec4abbe3e24

 oying-system/src/main/java/com/oying/modules/system/domain/UserStore.java

@@ -28,11 +28,9 @@
    @ApiModelProperty(value = "ID", hidden = true)
    private Long managerId;

    @TableId(value = "store_id")
    @ApiModelProperty(value = "门店id")
    private Long storeId;

    @TableId(value = "user_id")
    @ApiModelProperty(value = "用户id")
    private Long userId;