Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 5ad4fb34ee60e2d90d0cdb1d974ca0f4a2f26d95

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/Shop.java

@@ -38,9 +38,9 @@
    @TableField("pid")
    private Integer pid;

    @ApiModelProperty(value = "营业星期（1,2,3,4,5,6,7）")
    @ApiModelProperty(value = "营业星期：1-周一到周日 2-周一周五 3-仅周末")
    @TableField("business_date")
    private String businessDate;
    private Integer businessDate;

    @ApiModelProperty(value = "开始时间（HH:mm）")
    @TableField("start_time")