Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 e1fd9c69d375b691d83d08f3411124bc3a051a00

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/ShopDetailVO.java

@@ -31,7 +31,7 @@
    private String certification;

    @ApiModelProperty(value = "营业星期：1-周一到周日 2-周一周五 3-仅周末")
    private Integer businessDate;
    private Long businessDate;

    @ApiModelProperty(value = "开始时间（HH:mm）")
    private String startTime;