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 |
|
yinzuomei
|
7ff134f3a4
|
guide_category_default相关生成的代码，删除
|
4 years ago |
|
wxz
|
41f73d4253
|
【新增】1.完成网格内小组排名接口
|
4 years ago |
|
zxc
|
3d5e6cf1f5
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
zxc
|
989f6194e4
|
默认值
|
4 years ago |
|
zxc
|
b5fcc12655
|
排序
|
4 years ago |
|
zxc
|
fe3b7e02f4
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
zxc
|
bc1c0b292e
|
排序修改
|
4 years ago |
|
sunyuchao
|
ba82ead4be
|
Merge branch 'dev_group_msg' into develop
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
|
4 years ago |
|
sunyuchao
|
7ab738da40
|
漏提代码
|
4 years ago |
|
sunyuchao
|
50985c9532
|
程序调整优化
|
4 years ago |
|
zxc
|
1b9a3d6997
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
jianjun
|
f5d1c068e0
|
Merge remote-tracking branch 'remotes/origin/dev_statistical_optimize' into dev
|
4 years ago |
|
zxc
|
ccfbbbe015
|
全部党员
|
4 years ago |
|
zxc
|
cbde6493a7
|
全部党员
|
4 years ago |
|
zhaoqifeng
|
f86ea8eae0
|
办事指南
|
4 years ago |
|
sunyuchao
|
05f3762f41
|
8、活动/通知/话题评论允许有图片
|
4 years ago |
|
zxc
|
4ae2da12e2
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
zxc
|
da4abdd281
|
查询客户下党员
|
4 years ago |
|
zxc
|
dbe78557be
|
Merge remote-tracking branch 'origin/dev_guidance' into develop
|
4 years ago |
|
zxc
|
29256d2d77
|
群组介绍
|
4 years ago |
