Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-19 17e2f65826b3b69871e45c88238e5c7317f7ecb7

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

@@ -23,7 +23,7 @@
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("t_goods_bargain_price_detail")
@ApiModel(value="GoodsBargainPriceDetail对象", description="")
@ApiModel(value="门店特殊价格明细对象", description="")
public class GoodsBargainPriceDetail implements Serializable {

    private static final long serialVersionUID = 1L;