jianjun
|
3cd73f811f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
c29cf19a1a
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
1e5413ea8d
|
导出 上线
|
4 years ago |
|
jianjun
|
5a3275fe47
|
导出 上线
|
4 years ago |
|
jianjun
|
5fa3d88a95
|
楼梯代码
|
4 years ago |
|
jianjun
|
68234ec419
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
7aa539baf0
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
d2c92de554
|
导出巡查记录
|
4 years ago |
|
jianjun
|
7ebeaead8d
|
获取工作人员缓存代码提交
|
4 years ago |
wxz
|
853844618d
|
版本升级
|
4 years ago |
|
jianjun
|
7b8c5c5b46
|
代码暂存 避免大量冲突
|
4 years ago |
yinzuomei
|
ea1bba0ace
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
yinzuomei
|
b3f207821f
|
回复、接收人阅读消息、发布人查看回复
|
4 years ago |
zhaoqifeng
|
c8c8d32cba
|
通讯录消息相关接口
|
4 years ago |
sunyuchao
|
59ada443c6
|
字段补充
|
4 years ago |
|
sunyuchao
|
7fa8bbfd1b
|
【通讯录】姓名检索工作人员
|
4 years ago |
|
yinzuomei
|
376501061f
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
yinzuomei
|
f84506ea7b
|
发送消息同时发送站内信，增加info,infoId到user_message表，方便日后跳转消息详情。
|
4 years ago |
zxc
|
9e8d304b2b
|
统计服务升级
|
4 years ago |
|
zxc
|
c4d94c2d09
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
92ffdade57
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
d37b28c197
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
|
4 years ago |
|
jianjun
|
f35debd77c
|
代码暂存 避免大量冲突
|
4 years ago |
|
zxc
|
3f28a9ed80
|
edit
|
4 years ago |
|
zhaoqifeng
|
612cb410f8
|
通讯录消息相关接口
|
4 years ago |
|
zhaoqifeng
|
a23f5a89f5
|
通讯录消息相关接口
|
4 years ago |
|
sunyuchao
|
35d8dfcd9b
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
sunyuchao
|
a410bb0f7c
|
漏提代码
|
4 years ago |
|
zxc
|
9e97736838
|
统计服务升级
|
4 years ago |
|
zxc
|
1e4ed1c548
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
0011bb1b7e
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
yinzuomei
|
1aaa3cbdd5
|
发送消息
|
4 years ago |
|
zxc
|
c0b2f45c7e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
39d6b3a03d
|
接口名调整
|
4 years ago |
|
wxz
|
ce9d0ef51c
|
版本升级
|
4 years ago |
|
wxz
|
34240dac8c
|
Merge branches 'dev', 'master' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wxz
|
6d7444012f
|
fix:刚才改错了。。。
|
4 years ago |
|
wxz
|
bb778b4c0d
|
版本升级
|
4 years ago |
|
wxz
|
da93f0a5d4
|
Merge branch 'dev'
|
4 years ago |
|
wxz
|
b89a8d4b78
|
fix:查询客户人大代表接口，如果客户下没有人大代表，返回空列表，而不在查询org服务,防止报错
|
4 years ago |
|
sunyuchao
|
7d01a81e9a
|
工作人员解禁
|
4 years ago |
|
zxc
|
c3059f9c44
|
多客户修改
|
4 years ago |
|
sunyuchao
|
e97975e24e
|
新增工作人员V2-漏提文件
|
4 years ago |
|
yinzuomei
|
5eef00b0b1
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
yinzuomei
|
a4f9bd10f8
|
概要表的att_id=》first_att_id且可空
|
4 years ago |
|
sunyuchao
|
afe15fef3e
|
新增工作人员V2
|
4 years ago |
|
zxc
|
80f9bce380
|
多客户修改
|
4 years ago |
|
yinzuomei
|
835f7371b4
|
请选择接收人
|
4 years ago |
|
zxc
|
202d22e67a
|
事件分类统计org-day单客户修改
|
4 years ago |
|
jianjun
|
2e21304aa5
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info
|
4 years ago |
