jianjun
|
5fa3d88a95
|
楼梯代码
|
4 years ago |
|
jianjun
|
7ebeaead8d
|
获取工作人员缓存代码提交
|
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 |
|
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 |
|
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 |
|
yinzuomei
|
0011bb1b7e
|
Merge remote-tracking branch 'origin/dev_staff_info' into dev_staff_info
|
4 years ago |
|
yinzuomei
|
1aaa3cbdd5
|
发送消息
|
4 years ago |
|
sunyuchao
|
39d6b3a03d
|
接口名调整
|
4 years ago |
|
sunyuchao
|
7d01a81e9a
|
工作人员解禁
|
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 |
|
yinzuomei
|
835f7371b4
|
请选择接收人
|
4 years ago |
|
jianjun
|
2e21304aa5
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info
|
4 years ago |
|
jianjun
|
1adc371a44
|
Merge remote-tracking branch 'remotes/origin/dev_repeat_aop' into dev_staff_info
|
4 years ago |
|
sunyuchao
|
3e8b3e4788
|
通讯录接口模板提交
|
4 years ago |
wxz
|
c04da794db
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
c904f4178f
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
zxc
|
cffcf8eef2
|
网格员巡查
|
4 years ago |
|
yinzuomei
|
f9d03c4de3
|
消息相关表sql提交，生成代码提交
|
4 years ago |
|
wxz
|
54acd64931
|
修改:CPAuthxxx，增加打印header列表，给gateway日志绑定tranSerail
|
4 years ago |
|
zxc
|
7bc990fb31
|
Merge branch 'dev_category_top20' into dev
|
4 years ago |
|
zxc
|
2c1cef9822
|
排序暂时修改
|
4 years ago |
|
zxc
|
840da01eb4
|
群众诉求
|
4 years ago |
|
jianjun
|
5f6887f823
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
750da54715
|
删除多余方法
|
4 years ago |
|
zxc
|
4691e94507
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
6501a552b6
|
改回原样
|
4 years ago |
|
zxc
|
0e7b8aa987
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
a0488b8259
|
bug
|
4 years ago |
|
zxc
|
02653032bc
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
bfa344de01
|
赋值
|
4 years ago |
|
zxc
|
2f7facdca0
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
d8b77a24ff
|
网格员巡查状态修改
|
4 years ago |
|
zhaoqifeng
|
9cb736d542
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
b109340fce
|
上传巡查记录staffPatrolRecId不能为空
|
4 years ago |
|
jianjun
|
80ef4abd8e
|
利用aop加分布式锁方式解决 重复提交
|
4 years ago |
|
zhaoqifeng
|
4697d241ba
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
