From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 01 四月 2025 16:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtCustomConfigVo.java | 82 +++++++----------------------------------
1 files changed, 14 insertions(+), 68 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtCustomConfigVo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtCustomConfigVo.java
index 4bcdcb6..832ac8f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtCustomConfigVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MgtCustomConfigVo.java
@@ -6,84 +6,30 @@
import java.util.List;
/**
- * @ClassName MgtOtherConfigVo
+ * @ClassName MgtCustomConfigVo
* @Description TODO
* @Author jqs
- * @Date 2023/6/7 13:58
+ * @Date 2023/6/9 15:14
* @Version 1.0
*/
@Data
public class MgtCustomConfigVo {
- @ApiModelProperty(value = "分享小程序可获得积分")
- private Integer shareIntegral;
- @ApiModelProperty(value = "平台建议可获得积分")
- private Integer suggestPlatformIntegral;
- @ApiModelProperty(value = "每日签到可获得积分")
- private Integer signInIntegral;
+ @ApiModelProperty(value = "SHOP_EMERGENCY_DEGREE:合作商任务紧急程度 " +
+ "SHOP_FOLLOW_TYPE:合作商跟进类型" +
+ "SHOP_CUSTOM_STATUS:合作商状态" +
+ "SHOP_SOURCE_CHANNEL:来源渠道" +
+ "MEMBER_SOURCE_CHANNEL:会员来源" +
+ "MEMBER_CHARACTER:会员性格" +
+ "MEMBER_LEVEL:会员等级" +
+ "MEMBER_TYPE:会员类型" +
+ "NURSE_PROBLEM:调理问题")
+ private String configType;
- @ApiModelProperty(value = "门店建议可获得积分")
- private Integer suggestShopIntegral;
+ @ApiModelProperty(value = "自定义配置")
+ private List<String> customConfigList;
- @ApiModelProperty(value = "购物满1元可获得积分")
- private Integer payMoneyIntegral;
- @ApiModelProperty(value = "C端订单自动取消时间")
- private Integer orderAutoCancelTime;
-
- @ApiModelProperty(value = "首页风格1.鸿瑞堂2.古引坊")
- private Integer homeStyle;
-
- @ApiModelProperty(value = "合作商任务紧急程度")
- private String shopEmergencyDegree;
-
- @ApiModelProperty(value = "合作商跟进类型")
- private String shopFollowType;
-
- @ApiModelProperty(value = "合作商状态")
- private String shopCustomStatus;
-
- @ApiModelProperty(value = "来源渠道")
- private String shopSourceChannel;
-
- @ApiModelProperty(value = "会员来源")
- private String memberSourceChannel;
-
- @ApiModelProperty(value = "会员性格")
- private String memberCharacter;
-
- @ApiModelProperty(value = "会员等级")
- private String memberLevel;
-
- @ApiModelProperty(value = "会员类型")
- private String memberType;
-
- @ApiModelProperty(value = "调理问题")
- private String nurseProblem;
-
- @ApiModelProperty(value = "首页广告语")
- private String homeSlogan;
-
- @ApiModelProperty(value = "首页logo")
- private String homeLogo;
-
- @ApiModelProperty(value = "广告图片")
- private String adUrl;
-
- @ApiModelProperty(value = "链接类型1.外部2.内部3.无")
- private Integer targetType;
-
- @ApiModelProperty(value = "链接地址")
- private String linkUrl;
-
- @ApiModelProperty(value = "跳转类型1.门店详情2.秒杀活动3领券中心4.商城列表5.关于洪瑞堂")
- private Integer jumpType;
-
- @ApiModelProperty(value = "跳转id")
- private String jumpId;
-
- @ApiModelProperty(value = "活跃度list")
- private List<MgtActivenessVo> mgtActivenessVoList;
}
--
Gitblit v1.7.1