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
|
8a7367575e
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
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
|
82fbb606f2
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
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
|
72fb645a61
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
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
|
e3183b8ab6
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
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 |
|
zhaoqifeng
|
f178763d15
|
获取办事指南内容模块
|
4 years ago |
|
yinzuomei
|
1556f334df
|
bugfix
|
4 years ago |
|
jianjun
|
c5410d8c6c
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
dec3871c2d
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
c2f45bc4b6
|
wxController迁移
|
4 years ago |
|
yinzuomei
|
39e1f6c09b
|
Merge remote-tracking branch 'origin/dev_guidance' into dev_guidance
|
4 years ago |
|
yinzuomei
|
0fe294e7dc
|
qihuo
|
4 years ago |
|
jianjun
|
1ea60fdee5
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
jianjun
|
ab0bdaf7a4
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
jianjun
|
b7156d618a
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# 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
# epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
|
4 years ago |
|
jianjun
|
9713c18a78
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
Conflicts:
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
epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/feign/ThirdOpenFeignClient.java
|
4 years ago |
|
jianjun
|
4777b56d32
|
wxController
|
4 years ago |
|
zhaoqifeng
|
6e79562bff
|
办事指南附件上传
|
4 years ago |
|
zhaoqifeng
|
b0eb2dc7ad
|
客户下组织树
工作人员所在组织
|
4 years ago |
|
yinzuomei
|
005487aeba
|
分类
|
4 years ago |
|
yinzuomei
|
18c04e0ced
|
getcategory调整
|
4 years ago |
|
yinzuomei
|
7ba4e771a8
|
Merge remote-tracking branch 'origin/dev_guidance' into dev_guidance
|
4 years ago |
|
yinzuomei
|
e59701c4de
|
web分类列表查询不分页，分类下拉框通用接口
|
4 years ago |
zxc
|
a58a1df747
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
zxc
|
de42e5226a
|
paixushijian
|
4 years ago |
|
zxc
|
5f75b49e84
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
zxc
|
d919a1c09a
|
我的小组添加筛选条件
|
4 years ago |
sunyuchao
|
b9ba9f9ac8
|
Merge branch 'dev_group_msg' into develop
# Conflicts:
# epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java
|
4 years ago |
|
sunyuchao
|
76cc97293f
|
接口加返参、人员列表顺序调整
|
4 years ago |
|
wxz
|
9a66324acf
|
【新增】1.完成小组总排名接口
|
4 years ago |
|
zhaoqifeng
|
4eb9520ec7
|
Merge branch 'dev_guidance' into develop
|
4 years ago |
|
zhaoqifeng
|
5716a47e0a
|
办事指南增删改查
|
4 years ago |
