From aa925d851857f50eff0556411366690d9a78a0e5 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:30:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

---
 cloud-server-other/src/main/java/com/dsh/other/entity/StoredValueConfig.java |   88 ++++++++++++++++++++++----------------------
 1 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/StoredValueConfig.java b/cloud-server-other/src/main/java/com/dsh/other/entity/StoredValueConfig.java
index 4077640..a988c46 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/StoredValueConfig.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/StoredValueConfig.java
@@ -33,50 +33,50 @@
     private Integer id;
     /**
      * 规则配置JSON
-{
-	"rules": [{
-		"money": "100.0",
-		"usersCoins": "100.0",
-		"MemberCoins": "100.0",
-		"startTime": "",
-		"endTime": ""
-	}, {
-		"money": "200.0",
-		"usersCoins": "200.0",
-		"MemberCoins": "200.0",
-		"startTime": "",
-		"endTime": ""
-	}],
-	"time_rules": [{
-		"sameTime": [{
-			"money": "100.0",
-			"usersCoins": "100.0",
-			"MemberCoins": "200.0",
-			"startTime": "2023-06-01",
-			"endTime": "2023-06-15"
-		}, {
-			"money": "200.0",
-			"usersCoins": "200.0",
-			"MemberCoins": "400.0",
-			"startTime": "2023-06-01",
-			"endTime": "2023-06-15"
-		}]
-	}, {
-		"sameTime": [{
-			"money": "100.0",
-			"usersCoins": "100.0",
-			"MemberCoins": "300.0",
-			"startTime": "2023-07-01",
-			"endTime": "2023-07-15"
-		}, {
-			"money": "200.0",
-			"usersCoins": "200.0",
-			"MemberCoins": "600.0",
-			"startTime": "2023-07-01",
-			"endTime": "2023-07-15"
-		}]
-	}]
-}
+     * {
+     * "rules": [{
+     * "money": "100.0",
+     * "usersCoins": "100.0",
+     * "MemberCoins": "100.0",
+     * "startTime": "",
+     * "endTime": ""
+     * }, {
+     * "money": "200.0",
+     * "usersCoins": "200.0",
+     * "MemberCoins": "200.0",
+     * "startTime": "",
+     * "endTime": ""
+     * }],
+     * "time_rules": [{
+     * "sameTime": [{
+     * "money": "100.0",
+     * "usersCoins": "100.0",
+     * "MemberCoins": "200.0",
+     * "startTime": "2023-06-01",
+     * "endTime": "2023-06-15"
+     * }, {
+     * "money": "200.0",
+     * "usersCoins": "200.0",
+     * "MemberCoins": "400.0",
+     * "startTime": "2023-06-01",
+     * "endTime": "2023-06-15"
+     * }]
+     * }, {
+     * "sameTime": [{
+     * "money": "100.0",
+     * "usersCoins": "100.0",
+     * "MemberCoins": "300.0",
+     * "startTime": "2023-07-01",
+     * "endTime": "2023-07-15"
+     * }, {
+     * "money": "200.0",
+     * "usersCoins": "200.0",
+     * "MemberCoins": "600.0",
+     * "startTime": "2023-07-01",
+     * "endTime": "2023-07-15"
+     * }]
+     * }]
+     * }
      */
     private String content;
     /**

--
Gitblit v1.7.1