Merge branch 'pxb' into xin

xin

2025-09-05 6f3c170403f34d452b5dc733043145d8d760fe41

 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;