 管理员
|
c5a4900aa5
|
Merge branch 'dev_1118' into dev_youhua
# Conflicts:
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/comment/service/impl/EventCommentServiceImpl.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/application.yml
# esua-epdc/epdc-module/epdc-oss/epdc-oss-server/src/main/resources/application.yml
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
|
6 years ago |
|
管理员
|
73ee0625b8
|
Merge branch 'dev_1118' into dev_youhua
# Conflicts:
# esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
# esua-epdc/epdc-module/pom.xml
|
6 years ago |
|
管理员
|
83160303c4
|
Merge branch 'dev_youhua' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_youhua
# Conflicts:
# esua-epdc/epdc-admin/epdc-admin-server/pom.xml
|
6 years ago |
|
管理员
|
b2ea62a48c
|
Merge branch 'dev_youhua' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_youhua
# Conflicts:
# esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
# esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java
# esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java
# esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
# esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
# esua-epdc/epdc-module/epdc-events/epdc-events-server/pom.xml
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/dao/EpdcEventsDao.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/EpdcEventsService.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/EpdcEventsServiceImpl.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
# esua-epdc/epdc-module/epdc-job/epdc-job-server/pom.xml
# esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/resources/application.yml
|
6 years ago |
yujintao
|
0aebaa9723
|
修改配置文件
|
6 years ago |
|
管理员
|
c3993f7ba1
|
分布式事务
|
6 years ago |
曲树通
|
827d9415d5
|
新闻删除下线 修改同步banner
|
6 years ago |
zhangyongzhangyong
|
763bdc7ea4
|
居民端，短信通知(1.议题：审核通过、审核不通过；2.项目：转成项目、项目结案、项目关闭；3.邻里社群：建群通过、建群不通过、被邀请入群)
|
6 years ago |
 尹作梅
|
c36e5adc71
|
events和job的yml文件bug修改
|
6 years ago |
|
曲树通
|
e51b4bef97
|
修改完善信息之后扫第二个网格昵称被替换问题
|
6 years ago |
|
尹作梅
|
895360d940
|
Merge remote-tracking branch 'origin/dev_youhua' into dev_youhua
|
6 years ago |
|
尹作梅
|
f59a852a23
|
api、job、events、news、oss、user、kpi、heart、group改为从nacos获取配置文件信息
|
6 years ago |
|
yujintao
|
3f0d83e087
|
合并kpi分支到youhua分支，并处理代码冲突
|
6 years ago |
|
尹作梅
|
2819edd9f9
|
解决冲突
|
6 years ago |
|
yujintao
|
214b3b6f30
|
合并heart分支到youhua分支
|
6 years ago |
|
yujintao
|
f68d40a372
|
配置文件修改
|
6 years ago |
wanggongfeng
|
4590e734d4
|
短信日志
|
6 years ago |
|
wanggongfeng
|
4040151345
|
短信日志
|
6 years ago |
liuchuang
|
24a6993d90
|
发送短信通知接口 init
|
6 years ago |
|
wanggongfeng
|
2451622444
|
短息管理
|
6 years ago |
|
曲树通
|
96fbaa073f
|
认证党员失败错误信息
|
6 years ago |
|
wanggongfeng
|
800db1437b
|
短信管理PC
|
6 years ago |
|
尹作梅
|
5749cd56c7
|
job的dev配置改为从nacos获取配置文件信息
|
6 years ago |
|
wanggongfeng
|
1eb882abb3
|
短信管理字段调整
|
6 years ago |
|
尹作梅
|
89ad9e21e0
|
api改为从nacos获取配置文件信息
|
6 years ago |
|
liuchuang
|
582c209586
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
liuchuang
|
14b594c074
|
修改测试bug
|
6 years ago |
|
wanggongfeng
|
99f92fbeb4
|
短信管理，短信日志模块
|
6 years ago |
|
曲树通
|
9552a7c489
|
网格长相关bug
|
6 years ago |
|
zhangyongzhangyong
|
5f326763fa
|
解决bug ： 工作端，首页，消息通知中没有消息或消息已经全部查看后，不应该显示小红点
|
6 years ago |
|
liuchuang
|
5995e079dc
|
添加短信模板类型常量信息
|
6 years ago |
|
尹作梅
|
30aa41300c
|
拉取市北网格化平台项目进度情况修改
|
6 years ago |
|
尹作梅
|
341c9d83cd
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
97381b68c9
|
bug#5032先锋市北，话题转成议题后，话题的评论和回复内容变成同一个时间
|
6 years ago |
|
liuchuang
|
2ba57fbada
|
修改议题类别统计接口按照一级分类统计
|
6 years ago |
|
liuchuang
|
feeff0ca55
|
修改网格化平台处理过程名称
|
6 years ago |
|
liuchuang
|
1b3bb94000
|
修改议题项目列表和详情接口
|
6 years ago |
|
yujintao
|
203ed1a8bf
|
添加孔村项目配置
|
6 years ago |
|
zhangyongzhangyong
|
1662b608b7
|
项目列表-移动app端，查询项目消息列表，清除查询条件READ_FLAG=1
|
6 years ago |
|
zhangyongzhangyong
|
8614366d85
|
项目管理菜单消息数量统计 - 增加查询条件：未读
|
6 years ago |
|
曲树通
|
c8017c3346
|
修改党员认证失败code
|
6 years ago |
|
wanggongfeng
|
0285d86034
|
处理<议题类别统计>接口BUG
|
6 years ago |
|
liuchuang
|
207250e013
|
修改webservice配置
|
6 years ago |
|
尹作梅
|
808eb73d75
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
f07a2af055
|
bug#5003党群议事项目列表中和详情中的不一致问题解决:统一取OUT_HANDLE_ADVICE
|
6 years ago |
|
曲树通
|
3396b6c860
|
完善：居民端党员认证失败返回code码
|
6 years ago |
|
尹作梅
|
8b2da2a033
|
bug#5016话题转议题后，话题评论与议题评论的屏蔽标识应保持一致
|
6 years ago |
|
尹作梅
|
a6bf848809
|
bug#5003党群议事项目列表中和详情中的不一致问题解决:统一取OUT_HANDLE_ADVICE
|
6 years ago |
|
尹作梅
|
951a1fe925
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
494ac18552
|
bug#5014话题管理导出添加数据权限
|
6 years ago |
