 尹作梅
|
7bc8f1153d
|
CachingUserInfoDTO中的id改为userId
|
6 years ago |
|
尹作梅
|
c7e828da41
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
尹作梅
|
b74c2b6bc5
|
查询CachingUserInfoDTOsql修改
|
6 years ago |
李鹏飞
|
dda77ece85
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
李鹏飞
|
c6afe11c4a
|
活动修改
|
6 years ago |
|
尹作梅
|
64f992bac3
|
Merge remote-tracking branch 'origin/test' into test
|
6 years ago |
|
尹作梅
|
8c6105ea35
|
实现user/needCachingUserInfoByUserId/{userId}接口
|
6 years ago |
yujintao
|
d9e7eae3d9
|
修复代码错误
|
6 years ago |
wanggongfeng
|
26dba563f0
|
full_name字段改为real_name by 张勇
|
6 years ago |
|
wanggongfeng
|
9f2ba5c479
|
志愿者认证
|
6 years ago |
zhangyongzhangyong
|
d7fe4f359a
|
志愿者表格字段修改
|
6 years ago |
|
wanggongfeng
|
4616c3cd10
|
志愿者认证
|
6 years ago |
|
wanggongfeng
|
2159caa3b4
|
get接口路径修改
|
6 years ago |
 管理员
|
7294afb796
|
Merge branch 'test' of http://121.42.41.42:7070/r/esua-epdc-cloud into test
|
6 years ago |
|
管理员
|
0b0674717d
|
修改nacos配置
|
6 years ago |
|
wanggongfeng
|
e7d053e090
|
取消报名接口添加“取消原因”
|
6 years ago |
|
wanggongfeng
|
e646692594
|
活动打卡接口
|
6 years ago |
|
wanggongfeng
|
4c503822ca
|
志愿者认证，去掉参数党员标识
|
6 years ago |
|
wanggongfeng
|
980fcf8b88
|
接口路径修改
|
6 years ago |
|
yujintao
|
f28ac4a5be
|
修改配置
|
6 years ago |
|
管理员
|
fe42b50557
|
分布式事务例子
|
6 years ago |
|
管理员
|
226069c759
|
修改合并异常
|
6 years ago |
|
管理员
|
06b39e9c91
|
Merge branch 'dev_youhua' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_youhua
|
6 years ago |
|
yujintao
|
d8e2d81a69
|
恢复文件；添加配置
|
6 years ago |
|
管理员
|
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 |
|
尹作梅
|
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 |
|
曲树通
|
96fbaa073f
|
认证党员失败错误信息
|
6 years ago |
|
尹作梅
|
5749cd56c7
|
job的dev配置改为从nacos获取配置文件信息
|
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 |
|
曲树通
|
9552a7c489
|
网格长相关bug
|
6 years ago |
|
zhangyongzhangyong
|
5f326763fa
|
解决bug ： 工作端，首页，消息通知中没有消息或消息已经全部查看后，不应该显示小红点
|
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 |
