From 8f2f35da0cbb07d8bf0d04468c8a2bdf5ee895e5 Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期二, 11 三月 2025 10:47:42 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constants/ConfigEnum.java | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constants/ConfigEnum.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constants/ConfigEnum.java index 3234cc1..ae3a9c1 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constants/ConfigEnum.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constants/ConfigEnum.java @@ -22,7 +22,13 @@ RETURN_ADDRESS_USER_NAME("RETURN_ADDRESS_USER_NAME",1,"退货地址用户名"), RETURN_ADDRESS_USER_PHONE("RETURN_ADDRESS_USER_PHONE",1,"退货地址手机号"), RETURN_ADDRESS_USER_ADDRESS("RETURN_ADDRESS_USER_ADDRESS",1,"退货地址"), - RETURN_CYCLE("RETURN_CYCLE",1,"退货周期,用户在收货后{}天可申请售后"); + RETURN_CYCLE("RETURN_CYCLE", 1, "退货周期,用户在收货后{}天可申请售后"), + MEMBER_POINTS_MONEY("MEMBER_POINTS_MONEY", 1, "会员每实际消费{}元"), + MEMBER_POINTS_POINTS("MEMBER_POINTS_POINTS", 1, "可获得{}积分"), + WISH_DESCRIPTION("WISH_DESCRIPTION", 1, "心愿求购说明配置"), + WISH_SHARE_TITLE("WISH_SHARE_TITLE", 1, "心愿求购分享标题"), + WISH_SHARE_IMG_URL("WISH_SHARE_IMG_URL", 1, "心愿求购分享图片"), + REFUND_OF_DEPOSIT("REFUND_OF_DEPOSIT", 1, "退款保证金"); private final String key; private final Integer keyType; //1=系统配置 private final String keyName; -- Gitblit v1.7.1