yinzuomei
|
bcc7d26b69
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
1ef07c1406
|
项目详情，只有工作人员查询缓存接口，需要发布：user、report服务
|
4 years ago |
zhaoqifeng
|
e21a4d8ae5
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
927687d698
|
指南详情防止报空指针异常
|
4 years ago |
|
zhaoqifeng
|
f0af01bec7
|
指南详情防止报空指针异常
|
4 years ago |
|
zhaoqifeng
|
3c9eb71a27
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
b0c64065e5
|
添加指南修改
|
4 years ago |
|
yinzuomei
|
58ac365d5f
|
办事指南相关表添加， 默认分类sql
|
4 years ago |
|
zhaoqifeng
|
f170d48f49
|
工作人员缓存增加agencyID
|
4 years ago |
wxz
|
df6865f577
|
Merge branch 'dev_group_msg' into develop
|
4 years ago |
|
wxz
|
6068aa0279
|
修改：
1.我的小组排名接口，去掉userId传入，改用token取
|
4 years ago |
|
wxz
|
9fafe51c71
|
Merge branch 'dev_group_msg' into develop
|
4 years ago |
|
wxz
|
2eebe89a5d
|
修改：
【小组排名】，去掉PageData，直接展示列表
|
4 years ago |
|
zhaoqifeng
|
15ec8ca593
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
06c6a152d7
|
获取办事指南内容模块
|
4 years ago |
|
zhaoqifeng
|
17cd89355a
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
yinzuomei
|
4147a7291e
|
添加注释：大屏新增普通事件列表：首次查询平阴整个客户下，近30天内的项目，展示分类名称（前端截取第一个-之前的文字）、颜色等级、项目标题。点击8个街道，联动。
|
4 years ago |
|
zhaoqifeng
|
c58018ee16
|
获取办事指南内容模块
|
4 years ago |
|
zhaoqifeng
|
d3c876faac
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
e039818a42
|
指南列表修改
|
4 years ago |
|
zhaoqifeng
|
a37dee7077
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
9ecc4f4e18
|
指南列表修改
|
4 years ago |
|
yinzuomei
|
325a834d2a
|
平阴项目分布接口调整 bugfix
|
4 years ago |
|
zhaoqifeng
|
e120ac45f6
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
7c465452e3
|
客户下组织树
|
4 years ago |
|
zhaoqifeng
|
a7f7434c4f
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
a36d41696e
|
客户下组织树
|
4 years ago |
|
zhaoqifeng
|
171e371e0c
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
40ad19b6f3
|
指南列表修改
|
4 years ago |
|
zhaoqifeng
|
63b8963ab2
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
02af83b58b
|
指南详情修改
|
4 years ago |
|
yinzuomei
|
4b419b31b4
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
1ecef89fb0
|
平阴项目分布接口调整
|
4 years ago |
|
zhaoqifeng
|
04bdc9b658
|
指南收藏和我的收藏列表
|
4 years ago |
|
wxz
|
d37402a5bc
|
Merge branch 'dev_group_msg' into develop
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
|
4 years ago |
|
wxz
|
6d467bf163
|
Merge branch 'dev_group_msg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_group_msg
|
4 years ago |
|
wxz
|
0955cf0500
|
【新增】1.完成我所在的小组排名
|
4 years ago |
|
yinzuomei
|
1a306b427f
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
yinzuomei
|
71fe7cacd7
|
/oper/crm/customer/getcostomerInfo调整，如果客户已删除，不要报空指针，user、crm
|
4 years ago |
jianjun
|
a321f6369c
|
Merge branch 'dev_test_wx_token' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
epmet-gateway/src/main/resources/bootstrap.yml
|
4 years ago |
|
jianjun
|
6ef1467c45
|
测试代码
|
4 years ago |
|
jianjun
|
f6c15d45ea
|
Merge branch 'dev_test_wx_token' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
33489a7aa1
|
测试代码
|
4 years ago |
|
jianjun
|
8136c4a5b3
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
94e7f017cb
|
1
|
4 years ago |
|
jianjun
|
1c9ff81019
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
babd4c73c2
|
wxController迁移
|
4 years ago |
|
yinzuomei
|
d6888275d1
|
代码冲突
|
4 years ago |
|
yinzuomei
|
62cbd719f8
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
|
4 years ago |
|
zhaoqifeng
|
1c9c06e394
|
Merge remote-tracking branch 'origin/dev_guidance' into dev_guidance
|
4 years ago |
