jianjun
|
76e25d8fe8
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
3fe62f4a70
|
错误修改
|
4 years ago |
zxc
|
00abdbf771
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
097b92c674
|
补漏
|
4 years ago |
|
jianjun
|
1f437a8db6
|
Merge remote-tracking branch 'remotes/origin/dev_repeat_aop' into dev
|
4 years ago |
yinzuomei
|
081f5eee4a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
3603827b03
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into release_temp
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml
|
4 years ago |
|
yinzuomei
|
7807e8de70
|
right
|
4 years ago |
|
yinzuomei
|
18bfe54860
|
?
|
4 years ago |
|
yinzuomei
|
716a8edf67
|
?
|
4 years ago |
|
yinzuomei
|
2e4c294775
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into release_temp
|
4 years ago |
|
yinzuomei
|
36aa9ea21a
|
?
|
4 years ago |
zhaoqifeng
|
999be22baa
|
Merge branch 'dev_staff_info' into develop
|
4 years ago |
|
zhaoqifeng
|
22530cdbdb
|
通讯录消息相关接口
|
4 years ago |
|
yinzuomei
|
886355b89f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into release_temp
|
4 years ago |
|
yinzuomei
|
fa47a37616
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
yinzuomei
|
2a904497ff
|
群众直报待处理、处理中、已办结图片升序
|
4 years ago |
|
yinzuomei
|
7b9f9ede90
|
删除test
|
4 years ago |
|
jianjun
|
4252b75d7e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_staff_info
|
4 years ago |
|
jianjun
|
cf4ad99fd0
|
发送消息微调
|
4 years ago |
|
yinzuomei
|
527a445339
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
|
4 years ago |
|
yinzuomei
|
d906993c57
|
详情返回组织名与我收到的key保持一致
|
4 years ago |
sunyuchao
|
5fddcfed68
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
5f2d9d7e47
|
Merge branch 'dev_staff_info' into develop
|
4 years ago |
|
sunyuchao
|
b934e285a2
|
2234
|
4 years ago |
|
sunyuchao
|
e3f5341957
|
工作人员禁用、编辑、网格添加移除人员、部门添加移除人员方法添加删除人员缓存逻辑，调通的奇峰加
|
4 years ago |
|
yinzuomei
|
b9c2eb6f35
|
代码合并错误
|
4 years ago |
|
yinzuomei
|
d4914e12f4
|
代码合并错误
|
4 years ago |
|
yinzuomei
|
54888b12bc
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
|
yinzuomei
|
f4464f5b0a
|
发送消息接收人移除自己
|
4 years ago |
|
sunyuchao
|
f08cc83182
|
议题转项目v2接口添加重复提交校验注解
|
4 years ago |
|
sunyuchao
|
e9a58b947e
|
议题转项目、项目流转选人接口逻辑调整
|
4 years ago |
|
jianjun
|
d1bbc2241f
|
描述修改
|
4 years ago |
|
jianjun
|
f4e58c3480
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_staff_info
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
|
zhaoqifeng
|
d2c4e43e68
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
a9e3160cd9
|
党员认证防重复提交
|
4 years ago |
|
zxc
|
abc9af1f11
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
f6f7bee82e
|
工作人员调动
|
4 years ago |
|
zxc
|
4a34dcf6bc
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
28d8c5aee7
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
694e28a32a
|
徽章地址查询
|
4 years ago |
|
zxc
|
5b5b468ac2
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
|
4 years ago |
|
sunyuchao
|
34581f076f
|
接口逻辑调整
|
4 years ago |
|
yinzuomei
|
31ff8d5f80
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
|
4 years ago |
|
yinzuomei
|
341ad6e0c3
|
回复列表
|
4 years ago |
|
yinzuomei
|
8d554ef2ef
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
|
4 years ago |
|
yinzuomei
|
ed6eb9be60
|
woshoudaode
|
4 years ago |
|
yinzuomei
|
7f4c254b21
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
|
4 years ago |
|
yinzuomei
|
e729cbb1ff
|
dev
|
4 years ago |
|
yinzuomei
|
58eb20b7c1
|
Merge remote-tracking branch 'origin/dev_staff_info' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
# epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
|
4 years ago |
