 James
|
932c5e6a79
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
b598fff9c9
优化会议表(预约成功)-新增会议接口，将通知类型改为复选框，可以同时选择多个发送类型发送消息
|
1 gadu atpakaļ |
|
James
|
de713ab36a
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
26ab91d974
优化会议室预约情况列表接口，当日会议信息按时间升序排列，同时当日会议使用时间点数组按时间点升序排列
|
1 gadu atpakaļ |
 hanzhengyi
|
ddfb949689
Merge branch 'han' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
hanzhengyi
|
e6ab433d94
解决冲突
|
1 gadu atpakaļ |
|
James
|
f1db5f4969
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
hanzhengyi
|
9b67f83b89
APP设备心跳新增接口增加IP获取
|
1 gadu atpakaļ |
|
james
|
841b15b0f7
优化会议室表-删除接口，增加“会议室有设备不可删除”和“有会议记录不可删除”校验，优化楼层表-删除接口，增加"当前楼层有关联会议室
|
1 gadu atpakaļ |
|
hanzhengyi
|
655a1c9d65
增加service-agbox模块
|
1 gadu atpakaļ |
|
hanzhengyi
|
52f1ffe968
删除alarm模块文件夹
|
1 gadu atpakaļ |
|
hanzhengyi
|
4c8c23a30f
APP设备心跳新增接口
|
1 gadu atpakaļ |
|
James
|
ff9ac5eb54
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
9d731f354d
'优化会议室-会议室详情接口，新增预约人和参会人详情信息'
|
1 gadu atpakaļ |
|
James
|
be102247a9
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
4e9927e2cb
'''
|
1 gadu atpakaļ |
|
James
|
a9ac47a094
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
64e3bc6e7b
'开发会议室-会议室详情接口，优化会议文件-添加会议文件接'
|
1 gadu atpakaļ |
|
James
|
fcad0b6702
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
57d9277995
''
|
1 gadu atpakaļ |
|
james
|
40b236e4d2
'优化定时任务更新会议室逻辑，优化新增会议接口，增加上传多个会议文件信息与会议id进行关联保存到会议文件表中'
|
1 gadu atpakaļ |
|
James
|
6695561f9f
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
ce17419dc5
'开发人员签到人员签退接口,添加会议文件,查询会议文件列表接口，并创建定时任务定时更新会议状态'
|
1 gadu atpakaļ |
|
James
|
1d8c9f12aa
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
db15163752
'开发我的会议列表接口和开发查询会议签到信息接口'
|
1 gadu atpakaļ |
|
James
|
86df9c7767
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
c2af99811a
'开发会议表(预约成功)-取消会议预约申请接口和优化会议室预约情况列表接口，请求接口时报查询sql报错，是由于配置类文件某个字段注解使用错误'
|
1 gadu atpakaļ |
|
James
|
4bba0f499b
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
|
james
|
b4bab75781
'开发会议表(预约成功)-查询会议记录接口'
|
1 gadu atpakaļ |
|
James
|
262fe7acb6
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
1 gadu atpakaļ |
