Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-17 d5a37030c493917acce2c1ee15b3c08731cd31d1

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

@@ -65,10 +65,29 @@

    @ApiModelProperty(value = "添加用户id")
    @TableField("create_user_id")
    private Integer createUserId;
    private Long createUserId;

    @TableField(exist = false)
    private List<GoodsBargainPriceDetail> goodsBargainPriceDetailList;

    @ApiModelProperty(value = "商品名称")
    @TableField(exist = false)
    private String goodsName;

    @ApiModelProperty(value = "所属分类")
    @TableField(exist = false)
    private String categoryName;

    @ApiModelProperty(value = "门店名称")
    @TableField(exist = false)
    private String shopName;

    @ApiModelProperty(value = "店长名称")
    @TableField(exist = false)
    private String ownerName;

    @ApiModelProperty(value = "店长手机号")
    @TableField(exist = false)
    private String ownerPhone;

}