Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-01-09 74b2581c8a9be309ca6454da3ff2c56501368771

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

@@ -1,5 +1,6 @@
package com.ruoyi.other.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.other.api.domain.Shop;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -36,6 +37,10 @@
    @ApiModelProperty(value = "详情图，多个逗号分隔")
    private String detailPicture;


    @ApiModelProperty(value = "现金支付（0=否，1=是）")
    private Integer cashPayment;

    @ApiModelProperty(value = "积分支付（0=否，1=是）")
    private Integer pointPayment;