 huangyuan
|
6bba8fa76a
Merge branch 'huangyuan-user' of lift-manager/lift-server into develop
|
5 vuotta sitten |
 黄远
|
e2f8f7839f
Merge branches 'develop' and 'huangyuan-user' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user
|
5 vuotta sitten |
|
黄远
|
834a1cc988
申请团队修改
|
5 vuotta sitten |
 wanghaicheng
|
0fd72d84fa
区域列表返回区域主管id，区域更新时修改更新时间
|
5 vuotta sitten |
 bieao
|
49fab986cc
Merge branch 'feature-bieao' of lift-manager/lift-server into develop
|
5 vuotta sitten |
 别傲
|
a9a909938a
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao
|
5 vuotta sitten |
|
别傲
|
2f723fc79c
修改计划增加待完成条件判断
|
5 vuotta sitten |
|
wanghaicheng
|
c1aa548ec2
Merge branch 'wanghaicheng' of lift-manager/lift-server into develop
|
5 vuotta sitten |
 wang-hai-cheng
|
00e69a8624
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng
|
5 vuotta sitten |
|
wang-hai-cheng
|
be9e98f394
编辑区域时修改区域主管，并更改项目关联的区域主管信息时，bug修复
|
5 vuotta sitten |
|
bieao
|
6fc8edaaab
Merge branch 'feature-bieao' of lift-manager/lift-server into develop
|
5 vuotta sitten |
|
别傲
|
a9c1a904c3
打开了按需保养的功能，保养间隔还是限定在15天以内
|
5 vuotta sitten |
|
别傲
|
139dfb8d37
项目组成员移除增加关联电梯判断
|
5 vuotta sitten |
|
别傲
|
fbabccc710
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao
|
5 vuotta sitten |
|
别傲
|
60b91f3a5e
项目组成员移除增加关联电梯判断
|
5 vuotta sitten |
|
wanghaicheng
|
59482434a1
Merge branch 'wanghaicheng' of lift-manager/lift-server into develop
|
5 vuotta sitten |
|
wang-hai-cheng
|
649fb41cc3
前端新增时会传值过来，设置电梯id为null，防止新增电梯主键重复
|
5 vuotta sitten |
|
wang-hai-cheng
|
7de8f827da
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng
|
5 vuotta sitten |
|
wang-hai-cheng
|
87bf28b273
修改文件上传，单文件最大限制为2MB
|
5 vuotta sitten |
|
wang-hai-cheng
|
14453bb68d
修复开工时间字段名不对应问题
|
5 vuotta sitten |
|
wanghaicheng
|
67566d7335
Merge branch 'wanghaicheng' of lift-manager/lift-server into develop
|
5 vuotta sitten |
|
wang-hai-cheng
|
96022b774e
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng
|
5 vuotta sitten |
|
wang-hai-cheng
|
3d9b8881b8
大修列表新增一个开工时间
|
5 vuotta sitten |
|
wanghaicheng
|
b71328ea4f
Merge branch 'wanghaicheng' of lift-manager/lift-server into develop
|
5 vuotta sitten |
|
wang-hai-cheng
|
0668c5e0af
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng
|
5 vuotta sitten |
|
wang-hai-cheng
|
5e76b6092b
优化导出
|
5 vuotta sitten |
|
wang-hai-cheng
|
272665c7be
取消电梯类型必传项。根据电梯类别判断电梯类型
|
5 vuotta sitten |
|
huangyuan
|
2ecbef0154
Merge branch 'huangyuan-user' of lift-manager/lift-server into develop
|
5 vuotta sitten |
|
黄远
|
1262663b39
Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into huangyuan-user
|
5 vuotta sitten |
|
黄远
|
3f3e118c87
修改token
|
5 vuotta sitten |
