 gez
|
ea9db7ebe9
Merge branch 'usky-zyj' of uskycloud/usky-modules into master
|
há 11 meses atrás |
|
gez
|
1c92b1c3b2
Merge branch 'fu-dev' of uskycloud/usky-modules into master
|
há 11 meses atrás |
 fuyuchuan
|
d89c2900e0
工作报告部分人员发送消息异常修复
|
há 11 meses atrás |
 hanzhengyi
|
43fb739660
Merge branch 'fu-dev' of uskycloud/usky-modules into master
|
há 11 meses atrás |
|
fuyuchuan
|
6ccdedca88
添加报告发送日志输出
|
há 11 meses atrás |
|
fuyuchuan
|
b9924bca24
修复部分用户消息通知异常
|
há 11 meses atrás |
 james
|
8308cb7c71
Merge branch 'usky-zyj' into server-165
|
há 11 meses atrás |
|
james
|
459748c239
优化获取设备topic列表接口，增加网关设备判断以及网关id的获取
|
há 11 meses atrás |
|
james
|
f0644a54a7
Merge branch 'usky-zyj' into server-165
|
há 11 meses atrás |
|
james
|
768d1d3405
优化产品信息表-新增接口，增加属性字段处理和录入1
|
há 11 meses atrás |
|
james
|
ac0b2c0513
Merge branch 'usky-zyj' into server-165
|
há 11 meses atrás |
|
james
|
5ff49e3847
优化产品信息表-新增接口，增加属性字段处理和录入
|
há 11 meses atrás |
|
james
|
3c82913d83
Merge branch 'usky-zyj' into server-165
|
há 11 meses atrás |
|
james
|
da7780d80f
1、优化获取设备topic列表接口，增加所属设备类型和所属网关字段，用于区分展示普通设备和网关设备发布者和订阅者、备注信息；
|
há 11 meses atrás |
|
james
|
2d197acbf0
Merge branch 'usky-zyj' into server-165
|
há 11 meses atrás |
|
james
|
cc17ab24cc
优化iot下发设备控制命令和service-eg门禁系统人员校验开门接口，增加设备所属类型和所属网关两个字段
|
há 11 meses atrás |
|
gez
|
ba924225b5
Merge branch 'fu-dev' of uskycloud/usky-modules into master
|
há 11 meses atrás |
 zhaojinyu
|
37277ccff4
注释掉测试页面
|
há 11 meses atrás |
|
fuyuchuan
|
835bf5bc89
工作报告发送消息更改对应模板代码调整
|
há 11 meses atrás |
|
james
|
d83085e401
Merge branch 'usky-zyj' into server-165
|
há 1 ano atrás |
|
james
|
5fb0a00ac1
优化获取设备topic列表接口，修改传入类中字段，以及接口返回topic结构
|
há 1 ano atrás |
|
fuyuchuan
|
eaeb5ab3f5
Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-modules into fu-dev
|
há 1 ano atrás |
|
gez
|
485bfcf267
Merge branch 'han' of uskycloud/usky-modules into master
|
há 1 ano atrás |
|
james
|
6f45afccbb
Merge branch 'usky-zyj' into server-165
|
há 1 ano atrás |
|
james
|
8492879ad7
优化设备信息表-导入接口，在导入类文件中新增设备所属类型和所属网关字段，同时处理设备所属类型下拉框值的处理
|
há 1 ano atrás |
|
hanzhengyi
|
a14f0e724a
解决冲突
|
há 1 ano atrás |
|
hanzhengyi
|
14475f1627
Merge branch 'fu-dev' of uskycloud/usky-modules into master
|
há 1 ano atrás |
|
fuyuchuan
|
acd1d1027b
Merge branch 'master' of http://47.111.81.118:3000/uskycloud/usky-modules into fu-dev
|
há 1 ano atrás |
|
fuyuchuan
|
37d280dc5f
ids项目代码恢复
|
há 1 ano atrás |
|
james
|
6efa874e54
Merge branch 'usky-zyj' into server-165
|
há 1 ano atrás |
