sunyuchao
|
a8b3c3653c
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
5 years ago |
|
sunyuchao
|
b0b8ecb4fa
|
gov-mine服务模板文件提交
|
5 years ago |
wxz
|
fd00986a70
|
1.db脚本补充
|
5 years ago |
|
wxz
|
d521b63fa6
|
1.db脚本补充
|
5 years ago |
|
wxz
|
794f3f0d3f
|
1.新增epmet-user,gov-access,oper-customize db脚本
|
5 years ago |
|
wxz
|
10b427ed2f
|
1.新增gov-mine服务模块
|
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 |
yinzuomei
|
d85b33f637
|
删除ErrorCode
|
5 years ago |
|
wxz
|
b978ffc448
|
Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
5 years ago |
|
wxz
|
022bf25985
|
1.调整拦截TokenDto Filter的逻辑
|
5 years ago |
|
yinzuomei
|
1314211d39
|
微信小程序id修改
|
5 years ago |
|
wxz
|
9e1420af15
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
5 years ago |
|
wxz
|
d551b175f9
|
1.调整拦截TokenDto Filter的逻辑，增加BaseTokenDto
|
5 years ago |
|
yinzuomei
|
142dead6b2
|
选择组织，进入首页入参Dto修改
|
5 years ago |
|
yinzuomei
|
fd166da964
|
orgId改为agencyId
|
5 years ago |
|
yinzuomei
|
02ab6e9e62
|
找回@LoginUser
|
5 years ago |
|
yinzuomei
|
6ecf864936
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
5 years ago |
|
yinzuomei
|
c80183c7cd
|
暂存1
|
5 years ago |
zhaoqifeng
|
278fbb4f21
|
党员自动认证规则修改
|
5 years ago |
|
wxz
|
0b50a182f3
|
1.CustomerDepartment中的字段org_id改为agency_id
|
5 years ago |
|
wxz
|
e51b747bc2
|
1.新增gov-access模块
|
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 |
|
yinzuomei
|
106382199c
|
删除staff_login_history表，创建staff_agency_history
|
5 years ago |
|
yinzuomei
|
0919eb7a45
|
/loginwxmp/getmyorg接口开发
|
5 years ago |
|
yinzuomei
|
b05fb2a12b
|
删除staff_login_history，改为staff_agency_history
|
5 years ago |
|
yinzuomei
|
aa2c0d1ab7
|
删除staff_login_history，改为staff_agency_history
|
5 years ago |
|
yinzuomei
|
84614c5a14
|
赞提
|
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 |
|
yinzuomei
|
3d2c935228
|
getCustomerStaffInfo修改
|
5 years ago |
|
yinzuomei
|
db83b28be0
|
Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
5 years ago |
|
wxz
|
c120b593c1
|
1.修改customer_organication为customer_agency
|
5 years ago |
|
yinzuomei
|
4b96cd16ec
|
修改auth、gateway模块redis连接地址
|
5 years ago |
|
yinzuomei
|
1c227402f1
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
5 years ago |
|
yinzuomei
|
6de6509b19
|
政府端小程序登录发送验证码、wxCode获取最近一次登录账户token、enterorg接口开发
|
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 |
