管理员
|
74f4cb13de
|
Merge branch 'release/yaoqingma_phone' into dev
|
6 years ago |
wanggongfeng
|
6625dcda51
|
干部评价添加提交人每天只能评价一次某个干部
|
6 years ago |
wanggongfeng
|
e5cba3212c
|
干部评价添加提交人每天只能评价一次某个干部
|
6 years ago |
yujintao
|
362e7595f2
|
合并master分支到heart&tag分支
|
6 years ago |
liuchuang
|
44c4771411
|
党群e事和邻里党群上传图片大于100kb进行图片压缩
|
6 years ago |
管理员
|
8856914a5f
|
Merge branch 'master' into release/yaoqingma_phone
|
6 years ago |
管理员
|
63fcbdfe43
|
修改docker文件,修复时区时间差8小时的问题
|
6 years ago |
管理员
|
331088d981
|
修改测试环境的端口和docker配置文件
|
6 years ago |
李鹏飞
|
b537c3b3c7
|
nacos命名空间增加
|
6 years ago |
李鹏飞
|
239ad8680b
|
领导端小程序面板权限
|
6 years ago |
曲树通
|
2af789a3fb
|
删除党员前判断此党员是否被认证
|
6 years ago |
liuchuang
|
9b33eda12c
|
Merge remote-tracking branch 'origin/release/myGroupSqlSlowly' into dev
|
6 years ago |
liuchuang
|
35c491a3e3
|
优化邻里党群我的群列表查询慢问题
|
6 years ago |
曲树通
|
81fbe32e27
|
解决已认证党员速度慢问题以及已认证党员跟数据分析不一致问题
|
6 years ago |
曲树通
|
7221a3e51b
|
未认证居民导出
|
6 years ago |
曲树通
|
fb9a26b909
|
补充
|
6 years ago |
曲树通
|
d98d8421cd
|
用户相关导出
|
6 years ago |
yujintao
|
372e52da6a
|
完善信息用户头像相关修改;党员认证时间相关修改
|
6 years ago |
管理员
|
513c9d5ecd
|
修改nacos的环境
|
6 years ago |
管理员
|
a6d8d22a68
|
清理pom文件
|
6 years ago |
管理员
|
a467dc8a8a
|
删除没有用到的模块
|
6 years ago |
曲树通
|
c3eb8f8d89
|
修改已注册居民数=待认证+已认证+失败
|
6 years ago |
管理员
|
2ffd4fb55a
|
redis集群部署docker
|
6 years ago |
曲树通
|
155e2ccc48
|
修改一认证党员列表 姓名 身份证号取值
|
6 years ago |
曲树通
|
8d28271d82
|
修改已认证党员列表所属网格显示取值
|
6 years ago |
曲树通
|
034b2a1e5f
|
已认证居民修改
|
6 years ago |
yujintao
|
1207f59a0f
|
修复代码冲突
|
6 years ago |
管理员
|
74a961ddda
|
添加docker配置文件
|
6 years ago |
曲树通
|
9cb1067d4c
|
新增所有用户
|
6 years ago |
liuchuang
|
04d09f2cd6
|
Merge remote-tracking branch 'origin/dev_analysis_0220' into feature/yaoqingma_phone
# Conflicts:
# esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
|
6 years ago |
yujintao
|
5a1b431f38
|
补充代码
|
6 years ago |
yujintao
|
2c6f36fa4b
|
合并dev_analysis到dev_1118+analysis,命名为feature/heart&tag 。包含测试内容:爱心互助,用户角色标签
|
6 years ago |
yujintao
|
2b7e0d21c3
|
补充上次
|
6 years ago |
yujintao
|
c2390305a6
|
合并kpi
|
6 years ago |
yujintao
|
88cf7d551e
|
修复不能更新用户头像的bug;重新梳理数据校验与组装的代码
|
6 years ago |
yujintao
|
eb07ae9744
|
提交代码
|
6 years ago |
yujintao
|
97207febb6
|
网格员维护修改
|
6 years ago |
yujintao
|
e862a22f46
|
代码格式化
|
6 years ago |
曲树通
|
72fbdd1373
|
修改校验身份证格式
|
6 years ago |
yujintao
|
fa538b72eb
|
首页功能入口设置新增字段
|
6 years ago |
liuchuang
|
42a920eb3a
|
生产环境配置rocketmq
|
6 years ago |
liuchuang
|
0f719386ab
|
生产环境配置rocketmq
|
6 years ago |
liuchuang
|
f62be94f1b
|
生产环境配置rocketmq
|
6 years ago |
liuchuang
|
dfe4ff5146
|
组织机构信息和分类信息修改使用RocketMQ同步KPI模块
|
6 years ago |
yujintao
|
950131f2b6
|
用户数据分析相关修改
|
6 years ago |
liuchuang
|
8c202177ee
|
Merge branch 'dev_analysis' into dev_1118+analysis
# Conflicts:
# esua-epdc/epdc-admin/epdc-admin-server/pom.xml
# esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
# esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java
# 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/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/events/EpdcEventsDao.xml
# esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
# esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
# esua-epdc/epdc-module/epdc-news/epdc-news-server/pom.xml
# esua-epdc/epdc-module/epdc-user/epdc-user-server/pom.xml
# 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/service/UserService.java
# esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
|
6 years ago |
liuchuang
|
abfe2a5949
|
组织机构信息和分类信息修改使用RocketMQ同步全库
|
6 years ago |
liuchuang
|
757d2e4b06
|
组织机构信息和分类信息修改使用RocketMQ同步全库
|
6 years ago |
yujintao
|
558251ee7a
|
完善企业信息时阻止频繁提交
|
6 years ago |
曲树通
|
082bb772f1
|
修改代码
|
6 years ago |