Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-17 6b36f5df29db44faea5a8074aa62ba2ecdeef859

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

@@ -21,7 +21,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_goods_shop")
@ApiModel(value="GoodsShop对象", description="")
@ApiModel(value="指定门店对象", description="")
public class GoodsShop implements Serializable {

    private static final long serialVersionUID = 1L;