zxc
|
92ffdade57
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
794047aee3
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
085ee3419e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
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 |
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
|
6d7444012f
|
fix:刚才改错了。。。
|
4 years ago |
|
wxz
|
b89a8d4b78
|
fix:查询客户人大代表接口，如果客户下没有人大代表，返回空列表，而不在查询org服务,防止报错
|
4 years ago |
|
zxc
|
22f39235f9
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
sunyuchao
|
7d01a81e9a
|
工作人员解禁
|
4 years ago |
|
zxc
|
0466cc971c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
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
|
f4ef0c1a81
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
ad94c64cf1
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
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 |
|
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
|
ce438d13d5
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
1bc4a1e2f3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
cffcf8eef2
|
网格员巡查
|
4 years ago |
|
wxz
|
41bfe659fc
|
Merge branch 'dev' into develop
|
4 years ago |
|
yinzuomei
|
f9d03c4de3
|
消息相关表sql提交，生成代码提交
|
4 years ago |
|
wxz
|
54acd64931
|
修改:CPAuthxxx，增加打印header列表，给gateway日志绑定tranSerail
|
4 years ago |
|
zxc
|
6acfc33dd3
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
8ff3dc93a9
|
Merge branch 'dev_category_top20' into develop
|
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
|
646fff4f4a
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
