From 5bcf41f8c4ee63deded73a5a54ecac9a8fb4bc3c Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期五, 18 九月 2026 14:14:39 +0800
Subject: [PATCH] Merge branch 'master' of http://124.222.109.197:10000/r/jingshen/cool-admin-midway
---
src/modules/push/service/open.ts | 5 ++---
src/modules/user/service/login.ts | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/modules/push/service/open.ts b/src/modules/push/service/open.ts
index b34b3b9..e165739 100644
--- a/src/modules/push/service/open.ts
+++ b/src/modules/push/service/open.ts
@@ -59,9 +59,8 @@
// 1. 淇濆瓨鍘熷绉伴噸鏁版嵁
const rawWeight = new PushWeightEntity();
rawWeight.deviceNo = data.deviceNo;
- rawWeight.uploadTime = data.uploadTime
- ? new Date(data.uploadTime)
- : new Date();
+ // rawWeight.uploadTime = data.uploadTime ? new Date(data.uploadTime) : new Date();
+ rawWeight.uploadTime = new Date();
rawWeight.garbageType = data.garbageType;
rawWeight.weight = data.garbageWeight || 0;
rawWeight.extraData =
diff --git a/src/modules/user/service/login.ts b/src/modules/user/service/login.ts
index 283706d..f1260bd 100644
--- a/src/modules/user/service/login.ts
+++ b/src/modules/user/service/login.ts
@@ -299,7 +299,7 @@
token: await this.generateSorterToken(info),
refreshExpire,
refreshToken: await this.generateSorterToken(info, true),
- sorterId: user.businessId,
+ sorterId: user.phone,
businessName: user.businessName,
phone: user.phone,
departmentId: user.departmentId,
--
Gitblit v1.9.1