Merge remote-tracking branch 'origin/master'

# Conflicts:
#	go.mod

app/svc/egg_energy/svc_egg_energy_test.go

@@ -0,0 +1,18 @@
+package egg_energy
+
+import (
+	md "applet/app/md/institutional_management/egg_energy"
+	"code.fnuoos.com/go_rely_warehouse/zyos_go_es.git/es"
+	"fmt"
+	"testing"
+)
+
+func TestStatisticsUserEggEcpmRange(t *testing.T) {
+	es.Init("http://120.55.48.175:9200", "elastic", "fnuo123")
+	var tempResp md.StatisticsEggPointResp
+	var err error
+	tempResp.StatisticsUserEggEcpmRange, err = StatisticsUserEggEcpmRange("egg_energy_user_egg_score_202451")
+	if err != nil {
+		fmt.Println(err)
+	}
+}

go.mod

@@ -33,8 +33,8 @@ require (
 )
 
 require (
+	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241220073933-42987f91e880
 	code.fnuoos.com/EggPlanet/egg_models.git v0.2.1-0.20241220110855-5eeb26f6c25b
-	code.fnuoos.com/EggPlanet/egg_system_rules.git v0.0.4-0.20241217040418-3640cd7169f0
 	code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.1-0.20241118083738-0f22da9ba0be
 	code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5
 	github.com/360EntSecGroup-Skylar/excelize v1.4.1