Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-25 559ee10df3622e4802ca5664b83b713cd3a75f97

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

@@ -50,6 +50,14 @@
    @TableField("end_time")
    private String endTime;

    @ApiModelProperty(value = "封面图片")
    @TableField("home_picture")
    private String homePicture;

    @ApiModelProperty(value = "详情图，多个逗号分隔")
    @TableField("details_picture")
    private String detailsPicture;

    @ApiModelProperty(value = "店长姓名")
    @TableField("shop_manager")
    private String shopManager;