From 06f455915bb9d11caa8829942f9007809ee9ae3d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 28 十一月 2024 16:37:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java |  128 ++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 128 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
new file mode 100644
index 0000000..440a334
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/GoodsArea.java
@@ -0,0 +1,128 @@
+package com.ruoyi.other.api.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author luodangjia
+ * @since 2024-11-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_goods_area")
+@ApiModel(value="GoodsArea对象", description="")
+public class GoodsArea implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id", type = IdType.NONE)
+    private Long id;
+
+    @ApiModelProperty(value = "商品id")
+    @TableField("goods_id")
+    private Integer goodsId;
+
+    @ApiModelProperty(value = "省")
+    @TableField("province")
+    private String province;
+
+    @ApiModelProperty(value = "省编号")
+    @TableField("province_code")
+    private String provinceCode;
+
+    @ApiModelProperty(value = "市")
+    @TableField("city")
+    private String city;
+
+    @ApiModelProperty(value = "市编号")
+    @TableField("city_code")
+    private String cityCode;
+
+    @ApiModelProperty(value = "区")
+    @TableField("districts")
+    private String districts;
+
+    @ApiModelProperty(value = "区编号")
+    @TableField("districts_code")
+    private String districtsCode;
+
+    @ApiModelProperty(value = "会员级别(1=普通会员,2=黄金会员,3=钻石会员,4=准代理,5=代理,6=总代,7=合伙人)")
+    @TableField("vip")
+    private Integer vip;
+
+    @ApiModelProperty(value = "现金支付(0=否,1=是)")
+    @TableField("cash_payment")
+    private Integer cashPayment;
+
+    @ApiModelProperty(value = "积分支付(0=否,1=是)")
+    @TableField("point_payment")
+    private Integer pointPayment;
+
+    @ApiModelProperty(value = "基础售价")
+    @TableField("selling_price")
+    private BigDecimal sellingPrice;
+
+    @ApiModelProperty(value = "基础积分")
+    @TableField("integral")
+    private Integer integral;
+
+    @ApiModelProperty(value = "可获得消费积分")
+    @TableField("earn_spending_points")
+    private Integer earnSpendingPoints;
+
+    @ApiModelProperty(value = "上级获得分佣金额")
+    @TableField("superior_subcommission")
+    private BigDecimal superiorSubcommission;
+
+    @ApiModelProperty(value = "上级获得返佣积分")
+    @TableField("superior_rebate_points")
+    private Integer superiorRebatePoints;
+
+    @ApiModelProperty(value = "获取返佣积分上级类型(1=直推上级,2=直帮上级)")
+    @TableField("superior_type")
+    private Integer superiorType;
+
+    @ApiModelProperty(value = "核销门店可获得服务费")
+    @TableField("servuce_shop_charges")
+    private BigDecimal servuceShopCharges;
+
+    @ApiModelProperty(value = "核销门店可获得服务积分")
+    @TableField("servuce_shop_points")
+    private Integer servuceShopPoints;
+
+    @ApiModelProperty(value = "技师可获得服务积分")
+    @TableField("technician_points")
+    private Integer technicianPoints;
+
+    @ApiModelProperty(value = "绑定门店可获得分佣金额")
+    @TableField("bound_shop_charges")
+    private BigDecimal boundShopCharges;
+
+    @ApiModelProperty(value = "绑定门店可获得返佣积分")
+    @TableField("bound_shop_points")
+    private Integer boundShopPoints;
+
+    @ApiModelProperty(value = "绑定门店上级门店可获得分佣金额")
+    @TableField("bound_shop_superiors_charges")
+    private BigDecimal boundShopSuperiorsCharges;
+
+    @ApiModelProperty(value = "绑定门店上级门店可获得返佣积分")
+    @TableField("bound_shop_superiors_points")
+    private Integer boundShopSuperiorsPoints;
+
+
+}

--
Gitblit v1.7.1