From 12d094a193e190bedb1fcf35ac024eaec3c77e9f Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 19 二月 2025 12:03:45 +0800
Subject: [PATCH] merge

---
 db/db.go |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/db/db.go b/db/db.go
index 7a108d7..a71ef97 100644
--- a/db/db.go
+++ b/db/db.go
@@ -241,15 +241,15 @@
 			Scope:   "",
 			RuleArg: RuleArg{
 				Alias:    "duration",
-				Name:     "鏃堕棿娈�",
+				Name:     "鐩戞帶鏃堕棿",
 				Type:     "input",
-				Must:     false,
-				Unit:     "澶�",
-				Range:    "1,2400",
+				Must:     true,
+				Unit:     "澶╁唴",
+				Range:    "1,60",
 				Value:    "30",
 				ValType:  "int",
-				Operator: ">=",
-				Sort:     2,
+				Operator: "==",
+				Sort:     1,
 			},
 		},
 		{
@@ -257,16 +257,16 @@
 			ModelId: ModelIdLocationAnalysis,
 			Scope:   "",
 			RuleArg: RuleArg{
-				Alias:    "personCount",
-				Name:     "鍑虹幇浜烘暟",
-				Type:     "input",
+				Alias:    "timeRange",
+				Name:     "鍑虹幇鏃堕棿",
+				Type:     "range",
 				Must:     true,
-				Unit:     "涓�",
-				Range:    "1,100",
-				Value:    "1, 90",
+				Unit:     "鐐�",
+				Range:    "0,23",
+				Value:    "9,10",
 				ValType:  "int",
-				Operator: ">=",
-				Sort:     0,
+				Operator: "==",
+				Sort:     2,
 			},
 		},
 		{
@@ -278,12 +278,12 @@
 				Name:     "鍑虹幇娆℃暟",
 				Type:     "input",
 				Must:     true,
-				Unit:     "",
+				Unit:     "娆�",
 				Range:    "",
 				Value:    "",
 				ValType:  "int",
 				Operator: ">=",
-				Sort:     1,
+				Sort:     0,
 			},
 		},
 

--
Gitblit v1.8.0