合并最新代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

models/user_business_analysis.go

@@ -1133,11 +1133,7 @@ func setUniqueUserId(jsonString string, value map[int64]int64) (string, int) {
 
 func addUserToMap(currentUserActivity map[int64]map[int64]int64, registDate timeutil.TimeStamp, userId int64, currentTimeNow time.Time) {
 	registTime := registDate.AsTimeInLocation(currentTimeNow.Location())
-<<<<<<< HEAD
-	CountDateTime := time.Date(registDate.Year(), registTime.Month(), registTime.Day(), 0, 1, 0, 0, currentTimeNow.Location())
-=======
 	CountDateTime := time.Date(registTime.Year(), registTime.Month(), registTime.Day(), 0, 1, 0, 0, currentTimeNow.Location())
->>>>>>> origin/V20220718
 	CountDate := CountDateTime.Unix()
 	if _, ok := currentUserActivity[CountDate]; !ok {
 		userIdMap := make(map[int64]int64, 0)