 bieao
|
833c689973
Merge branch 'feature-bieao' of lift-manager/lift-server into develop
|
5 gadi atpakaļ |
 别傲
|
e890ef57ff
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao
|
5 gadi atpakaļ |
|
别傲
|
8c70df1b51
修复bug：提前保养，维保计划全部完成，增加判断
|
5 gadi atpakaļ |
 wanghaicheng
|
4030dbc064
Merge branch 'wanghaicheng' of lift-manager/lift-server into develop
|
5 gadi atpakaļ |
 wang-hai-cheng
|
133541f519
保养单导出，保养记录没有停梯，恢梯时间问题兼容。
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
75fe958867
维保记录列表，维保时间可能为null的bug修复
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
830690ebfe
签到打卡导出,支持根据用户id列表和月份导出
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
73b5d6cb8a
签到打卡导出
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
c4b2721bd2
保养单导出，加上电梯内部编码
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
0d2665566b
兼容停梯时间，恢梯时间为null的情况下报错问题
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
df536fe14c
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
4b1870886b
修改用户申请加入项目查询出多个值，使用一个值来接收的问题
|
5 gadi atpakaļ |
|
wanghaicheng
|
a21a1c842e
Merge branch 'wanghaicheng' of lift-manager/lift-server into develop
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
1eea3ae030
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
63bc1bf36b
停梯/恢梯/保养时间判空，维保项判空，保养时长判空
|
5 gadi atpakaļ |
|
bieao
|
e2f1dfe311
Merge branch 'feature-bieao' of lift-manager/lift-server into develop
|
5 gadi atpakaļ |
|
别傲
|
41282306d3
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao
|
5 gadi atpakaļ |
|
别傲
|
c0510aa259
修复bug：app项目列表实际台量错误问题
|
5 gadi atpakaļ |
|
wanghaicheng
|
6025a2d73c
Merge branch 'wanghaicheng' of lift-manager/lift-server into develop
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
d7e34bea29
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
ad0d308a2c
维保记录导出，先上传到阿里云oss，然后返回文件地址给前端
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
2247b4cbf1
新增/编辑 电梯信息，检测信息请求合法性
|
5 gadi atpakaļ |
 huangyuan
|
e06d68e5bf
Merge branch 'huangyuan-user' of lift-manager/lift-server into develop
|
5 gadi atpakaļ |
 黄远
|
97ab237ee1
Merge branches 'develop' and 'huangyuan-user' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user
|
5 gadi atpakaļ |
|
黄远
|
ce847d99e8
电梯状态数据获取
|
5 gadi atpakaļ |
|
huangyuan
|
17bc5736e1
Merge branch 'huangyuan-user' of lift-manager/lift-server into develop
|
5 gadi atpakaļ |
|
wanghaicheng
|
350da23f98
Merge branch 'wanghaicheng' of lift-manager/lift-server into develop
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
a9c38d7a19
移动ImageUtil到util文件夹
|
5 gadi atpakaļ |
|
wang-hai-cheng
|
e62ff44ab6
优化保养单导出，取消导出维保图片，速度太慢，影响导出数量
|
5 gadi atpakaļ |
|
wanghaicheng
|
b6a10dc469
Merge branch 'wanghaicheng' of lift-manager/lift-server into develop
|
5 gadi atpakaļ |
