 james
|
31a98d6118
Merge branch 'master' into usky-zyj
|
8 meses atrás |
|
James
|
6efa8039f3
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
james
|
b4c8d77dd7
'优化微信综合智慧云-跳转首页权限接口，将openId查询接口返回给前端做判断处理，联调测试接口'
|
8 meses atrás |
 gez
|
5f4018d61d
Merge branch 'server-165' of uskycloud/usky-modules into master
|
8 meses atrás |
 fuyuchuan
|
9082cddb3c
Merge branch 'fu-dev' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
fuyuchuan
|
85c217e5f9
打通job定时发送工作报告
|
8 meses atrás |
|
fuyuchuan
|
761fbb2c0d
Merge branch 'fu-dev' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
fuyuchuan
|
cfac434b5a
修复消息中心接受消息问题代码
|
8 meses atrás |
|
fuyuchuan
|
eedcd4b08b
Merge branch 'fu-dev' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
fuyuchuan
|
170a3ee784
修复工作报告消息中心接收不到和工作报告标题异常问题
|
8 meses atrás |
|
fuyuchuan
|
8721d7f081
Merge branch 'server-165' of http://47.111.81.118:3000/uskycloud/usky-modules into fu-dev
|
8 meses atrás |
|
fuyuchuan
|
3087585cf7
Merge branch 'fu-dev' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
fuyuhchuan
|
0c28964828
修改工作报告中工时统计接口为可选择周或月，修复抄送钉钉格式问题
|
8 meses atrás |
|
James
|
b263972120
Merge branch 'server-165' of uskycloud/usky-modules into master
|
8 meses atrás |
|
fuyuchuan
|
a73765af43
Merge branch 'fu-dev' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
fuyuhchuan
|
e8ef432d37
新增定时发送逻辑、优化部分接口代码
|
8 meses atrás |
 hanzhengyi
|
845729c889
Merge branch 'han' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
hanzhengyi
|
924dc5a6b7
恢复定时任务线程池配置
|
8 meses atrás |
|
fuyuhchuan
|
e28f35f9ad
工作报告定时发送
|
8 meses atrás |
|
hanzhengyi
|
0569ca9f9c
告警异步
|
8 meses atrás |
|
gez
|
173dd1a906
Merge branch 'server-165' of uskycloud/usky-modules into master
|
8 meses atrás |
|
fuyuchuan
|
8992a3ffab
Merge branch 'fu-dev' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
fuyuhchuan
|
ced2bb4041
修复”需协调工作“不可为空问题，优化异步代码和调用消息中心、发送钉钉代码
|
8 meses atrás |
|
James
|
27d333f1f7
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
james
|
4cd77c617b
'测试'
|
8 meses atrás |
|
James
|
7f510762d3
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
james
|
9b8cf9dc62
'优化微信永天综合智慧云-跳转首页权限接口，修改openid值为空的判断'
|
8 meses atrás |
|
James
|
ab9707dd4d
Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165
|
8 meses atrás |
|
james
|
f3e56182fe
'优化微信永天综合智慧云-跳转首页权限接口，删除响应url中传给openid值'
|
8 meses atrás |
|
hanzhengyi
|
92651c72b8
更新 'service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmWorkReportServiceImpl.java'
|
9 meses atrás |
