yinzuomei
|
a281bee5c3
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid
|
5 years ago |
yinzuomei
|
f46d0fbc0b
|
partymember_confirm_manual添加read_flag,党员认证审核历史接口、查询待审核接口开发
|
5 years ago |
wangchao
|
8bb23839b1
|
政府端话题管理相关接口
|
5 years ago |
yinzuomei
|
2b470a9efb
|
党员认证-接口入口初始化service
|
5 years ago |
yinzuomei
|
3551dd91f5
|
党员认证-接口入口
|
5 years ago |
sunyuchao
|
6f4ea76443
|
政府端-热心居民申请详情接口添加返回字段
|
5 years ago |
wangchao
|
3e3a462487
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid
# Conflicts:
# epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/controller/ResiGroupController.java
# epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/ResiGroupFeignClient.java
# epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/feign/fallback/ResiGroupFeignClientFallBack.java
# epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiGroupService.java
# epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/ResiGroupServiceImpl.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupDao.java
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
|
5 years ago |
wangchao
|
f6da4109b3
|
楼院小组redis的get操作修改,缓存、数据库全流程封装,其余服务只需调用即可。政府端接口①待审核的小组列表②审核小组的详情(包含已审核与未审核)③同意建组申请④驳回建组申请。在resi-guide模块加上snakeYaml依赖解决bootstrap.yml无法试别@的问题。
|
5 years ago |
zhaoqifeng
|
278fbb4f21
|
党员自动认证规则修改
|
5 years ago |
wangchao
|
07b9eca3bc
|
合并dev分支
|
5 years ago |
wangchao
|
24b5f1b727
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govgrid
# Conflicts:
# epmet-gateway/pom.xml
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/ResiPartymemberFeignClient.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/ResiPartymemberFeignClientFallBack.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffGridService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java
# epmet-module/resi-partymember/resi-partymember-server/pom.xml
|
5 years ago |
wxz
|
4b1c51c2fc
|
1.修改customer_staff_agency.org_id为agency_id
|
5 years ago |
wxz
|
f7ada07fb3
|
1.修改customer_staff_agency.org_id为agency_id
|
5 years ago |
zhaoqifeng
|
dfa93ecb9e
|
添加 本网格的小组和小组管理界面信息
|
5 years ago |
wxz
|
c120b593c1
|
1.修改customer_organication为customer_agency
|
5 years ago |
wxz
|
c6dcd15824
|
1.修改redis和mysql连接和用户,指向mini主机
2.新增gov-org库的表自动生成文件
|
5 years ago |
yinzuomei
|
3b34cfb6ff
|
customer_grid修改
|
5 years ago |
yinzuomei
|
9e51c1dd8f
|
修改运营端登录接口改为login/operweb/loginbypassword,居民端登录接口改为/resiwxmp/loginbywxcode
|
5 years ago |
yinzuomei
|
7c76facd1e
|
登陆接口v1
|
5 years ago |
yinzuomei
|
21e6c59496
|
政府端登录发送短信验证码接口开发完成
|
5 years ago |
yinzuomei
|
c292353e59
|
暂时提交1
|
5 years ago |
yinzuomei
|
70a547ce5e
|
暂时提交
|
5 years ago |
sunyuchao
|
24743f40ef
|
删除之前的热心居民申请审核接口
|
5 years ago |
sunyuchao
|
4875319625
|
政府端-热心居民模块接口程序调测修改
|
5 years ago |
yinzuomei
|
d692b6818f
|
删除gov_org组织机构相关的代码,修改customer_grid,user模块新增customer_staff
|
5 years ago |
sunyuchao
|
571b266dfd
|
配置文件漏提代码
|
5 years ago |
sunyuchao
|
b267cc559a
|
居民端热心居民申请提交接口修改、政府端热心居民模块接口首次提交
|
5 years ago |
wangchao
|
d5a50040c7
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid
|
5 years ago |
wangchao
|
4ad1146e2d
|
resi_group数据库修改记录提交,待审核的小组DTO
|
5 years ago |
zhaoqifeng
|
6f110ffab6
|
添加 小组审核历史列表查询
|
5 years ago |
wangchao
|
5bca981187
|
数据库epmet_resi_group中的resi_group_operation(小组操作记录)表新增两个字段:①审核员人已读/未读标志②消息内容
|
5 years ago |
yinzuomei
|
a9a7b7f626
|
去除feign url
|
5 years ago |
zhaoqifeng
|
7045e178c1
|
添加 热心居民审核历史
|
5 years ago |
wangchao
|
949752ee76
|
delete temporary files
|
5 years ago |
wangchao
|
af3f526ac6
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid
|
5 years ago |
wangchao
|
75d895c826
|
Mark the "main" folder as resource,add temporary files(to be deleted)
|
5 years ago |
yinzuomei
|
ba804af737
|
去除db
|
5 years ago |
yinzuomei
|
a2b24bb79d
|
govgrid修改
|
5 years ago |
sunyuchao
|
bd6a5a8143
|
热心居民申请表添加字段对于代码添加相应字段
|
5 years ago |
wangchao
|
4d34225dd2
|
修改gov_gird模块,添加.gitkeep文件
|
5 years ago |
wangchao
|
4175b8dc99
|
dev_govgrid分支新建gov_gird模块
|
5 years ago |
wxz
|
c5b7e60e8e
|
版本调整为0.3.0,本里程碑,每次发版都递增最后一位即可。里程碑升级,最后一位重置为0
|
5 years ago |
yinzuomei
|
849253173f
|
8003:组名已存在,8201:请完善居民信息
|
5 years ago |
yinzuomei
|
b3e2d0dfba
|
修复我的消息查询bug
|
5 years ago |
yinzuomei
|
072636ff37
|
demo模块去除user-server依赖
|
5 years ago |
yinzuomei
|
d2f33f3c62
|
Merge branches 'dev' and 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
5 years ago |
zhaoqifeng
|
3c9a26b239
|
sql去掉数据库名
|
5 years ago |
yinzuomei
|
448fc87681
|
GOV配置修改
|
5 years ago |
wxz
|
fc9e815663
|
dev-local mysql和redis指向本地
升级版本
|
5 years ago |
yinzuomei
|
f9d6592e08
|
dev_local数据库改为连接localhost:3306,redis连接127.0.0.1
|
5 years ago |