 管理员
|
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 |
 尹作梅
|
c36e5adc71
|
events和job的yml文件bug修改
|
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 |
|
尹作梅
|
5749cd56c7
|
job的dev配置改为从nacos获取配置文件信息
|
6 years ago |
|
尹作梅
|
89ad9e21e0
|
api改为从nacos获取配置文件信息
|
6 years ago |
|
管理员
|
39ec88e7d0
|
k8s配置文件
|
6 years ago |
|
管理员
|
1c1a28859a
|
Merge branch 'dev_1118' into dev_youhua
# Conflicts:
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.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-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/UserAuthenticateHistoryEntity.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/PartyMembersService.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/PartyMembersServiceImpl.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
|
6 years ago |
|
管理员
|
cde1e1e41b
|
k8s配置文件
|
6 years ago |
|
尹作梅
|
0421ddf2c6
|
添加@Transactional注解
|
6 years ago |
|
尹作梅
|
bcbe92e869
|
DataReturn修改xml标签名
|
6 years ago |
|
尹作梅
|
cc0d6fce06
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
a5aebd581c
|
删除events模块派遣结案接口
|
6 years ago |
曲树通
|
65f116401d
|
党员用户身份证号都查重改为 判断是用户的时候直接把身份证号置为null 防止前端用户完善误传
|
6 years ago |
|
曲树通
|
919443ba1e
|
党员认证失败列表 已认证党员详情 认证失败党员详情
|
6 years ago |
|
尹作梅
|
a8eaafd887
|
派遣结案webservice接口v2
|
6 years ago |
liuchuang
|
e0495d5afd
|
修改webservice模块配置
|
6 years ago |
|
尹作梅
|
4b78a7adc3
|
派遣结案webservice接口v1
|
6 years ago |
|
liuchuang
|
a3693651d6
|
修改工作端bug
|
6 years ago |
|
曲树通
|
0b419ea0e5
|
修改工作端首页待认证用户数量
|
6 years ago |
|
liuchuang
|
5dcd76c816
|
网格化平台webservice模块 init
|
6 years ago |
|
liuchuang
|
f56aa0de80
|
工作端项目详情接口添加项目状态字段返回
|
6 years ago |
|
尹作梅
|
f30382e951
|
派遣信息接口开发v1
|
6 years ago |
|
曲树通
|
7ed9295d3b
|
已认证党员 认证失败党员加导出功能
|
6 years ago |
|
尹作梅
|
4afa8502ba
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
17d05a4803
|
首页面板获取工作端app菜单sql修改
|
6 years ago |
|
管理员
|
af822cfa15
|
Merge branch 'dev_youhua' of http://121.42.41.42:7070/r/esua-epdc-cloud into dev_youhua
|
6 years ago |
|
管理员
|
77b4863bbe
|
k8s配置文件
|
6 years ago |
|
曲树通
|
a3b313b3df
|
修改
|
6 years ago |
|
曲树通
|
2b0dd1c94b
|
修改bug
待认证居民 绑定网格列
|
6 years ago |
|
liuchuang
|
563588c7ad
|
添加Feign配置
|
6 years ago |
|
曲树通
|
aee330bbae
|
完善个人信息 修改为党员 居民都需要查重身份证号
|
6 years ago |
|
尹作梅
|
d6fc80a178
|
Merge remote-tracking branch 'origin/dev_1118' into dev_1118
|
6 years ago |
|
尹作梅
|
ec8695baa1
|
项目上报已上报过的提示信息
|
6 years ago |
|
liuchuang
|
1a85ce3098
|
修改调试问题
|
6 years ago |
|
尹作梅
|
5233f95abc
|
项目上报经纬度转换
|
6 years ago |
|
曲树通
|
5b7b4b8eb1
|
修改工作端党员列表和PC端不统一
|
6 years ago |
|
曲树通
|
bcf2b5fea0
|
党员失败详情
|
6 years ago |
|
liuchuang
|
5fdd550ef8
|
修改job模块测试环境配置
|
6 years ago |
|
liuchuang
|
053e49d941
|
网格化平台接口实现 init
|
6 years ago |
|
尹作梅
|
85c7575985
|
Merge remote-tracking branch 'origin/dev_heart' into dev_heart
|
6 years ago |
|
尹作梅
|
3dfe987ebe
|
修改创建活动定时审核cron表达式
|
6 years ago |
wanggongfeng
|
d2a326a073
|
活动开始自动审核已报名的志愿者接口修改
|
6 years ago |
|
yujintao
|
21d0cd9da5
|
excel校验添加规则
|
6 years ago |
