Merge branch 'master' of http://124.222.109.197:10000/r/jingshen/cool-admin...

wangzhibo

2026-09-18 5bcf41f8c4ee63deded73a5a54ecac9a8fb4bc3c

Merge branch 'master' of http://124.222.109.197:10000/r/jingshen/cool-admin-midway

 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 =

 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,