wangchao
|
2f54e53fe5
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerStaffAgencyController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerStaffAgencyDao.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerStaffAgencyService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffAgencyServiceImpl.java
# epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
|
6 years ago |
sunyuchao
|
23939c2cd6
|
数据库字段变动
|
6 years ago |
|
sunyuchao
|
c49f8d217c
|
政府端-部门模块接口
|
6 years ago |
yinzuomei
|
bc851c793f
|
解决冲突
|
6 years ago |
|
wangchao
|
f21e3a5a92
|
查询网格、部门可选人员列表，查询首页网格列表
|
6 years ago |
zhaoqifeng
|
75d662aabc
|
添加 组织-工作人员相关接口
|
6 years ago |
|
sunyuchao
|
71bb41f1da
|
解决代码冲突问题
|
6 years ago |
zxc
|
93ebde2984
|
添加部门人员dto
|
6 years ago |
|
sunyuchao
|
bfa6577b53
|
解决代码冲突问题
|
6 years ago |
|
sunyuchao
|
ede047da34
|
Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java
# epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml
|
6 years ago |
|
sunyuchao
|
2ee793e872
|
政府端-部门模块部分接口
|
6 years ago |
wxz
|
e359eafb80
|
1.修改根据角色和orgId查询人员的接口，增加角色名称，角色key的返回
|
6 years ago |
|
zxc
|
97a9c6f1f8
|
网格用户信息添加性别字段
|
6 years ago |
|
zhaoqifeng
|
3fac38169a
|
添加 组织-工作人员相关接口
|
6 years ago |
|
zxc
|
d5b49c2158
|
网格删除、修改、添加
|
6 years ago |
|
wxz
|
8320ac3028
|
1.增加DataFilter相关工具
2.实现了功能级RBAC
|
6 years ago |
|
sunyuchao
|
3a896a19e7
|
Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
6 years ago |
|
sunyuchao
|
167facfd7b
|
组织机构表字段修改（国家改为区县）
|
6 years ago |
|
yinzuomei
|
30849f12da
|
gov端点登录token字符串生成
|
6 years ago |
|
yinzuomei
|
055520dd82
|
冲突解决
|
6 years ago |
|
yinzuomei
|
fb0d1d90d0
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java
|
6 years ago |
|
yinzuomei
|
61369356ff
|
登录获取组织接口修改
|
6 years ago |
|
wxz
|
da33605149
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
wxz
|
34a0857083
|
1.新增：新增更新工作人员权限缓存接口
|
6 years ago |
|
zhaoqifeng
|
fa0410e633
|
添加 组织-工作人员相关接口
|
6 years ago |
|
sunyuchao
|
5b7abe5da2
|
重新提交gov-org下的feign实现接口
|
6 years ago |
|
sunyuchao
|
e204bdbde3
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallBack.java
|
6 years ago |
|
sunyuchao
|
87f2b17d5a
|
删除gov-org下的feign实现接口
|
6 years ago |
|
sunyuchao
|
60435a2c82
|
政府端-获取组织机构列表
|
6 years ago |
|
yinzuomei
|
6407ceee5f
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
yinzuomei
|
a48ed358b0
|
登录相关接口修改
|
6 years ago |
|
sunyuchao
|
2309bc135f
|
组织机构模块接口新建controller
|
6 years ago |
|
wangchao
|
2e749293e0
|
获取当前机关下网格列表
|
6 years ago |
|
zhaoqifeng
|
507d3ed8f6
|
修改 获取最近一次登录的客户信息
|
6 years ago |
|
zhaoqifeng
|
276f4d26fe
|
修改 获取最近一次登录的客户信息
|
6 years ago |
|
zxc
|
5efad797c0
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
zxc
|
1b815515db
|
EpmetUserFeignClientFallBack替换
|
6 years ago |
|
yinzuomei
|
519190d694
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
yinzuomei
|
2aa917d4ad
|
gov wxcode登录接口修改
|
6 years ago |
|
wxz
|
3a4bf0d93e
|
1.修复：查询角色下的用户列表接口
|
6 years ago |
|
zxc
|
3188233139
|
FeignClientFallBack添加getCustomerStaffInfoByUserId
|
6 years ago |
|
zxc
|
2b28fcd6a5
|
FeignClientFallBack添加getCustomerStaffInfoByUserId
|
6 years ago |
|
sunyuchao
|
da805fc845
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
sunyuchao
|
aea54666ef
|
政府端-删除机关组织接口优化
|
6 years ago |
|
zxc
|
824b0ee7ae
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
zxc
|
66c36c2991
|
获取网格详情接口添加
|
6 years ago |
|
wxz
|
61bec2dc5b
|
1.
新增：查询角色下的用户列表
|
6 years ago |
|
sunyuchao
|
6f4ea76443
|
政府端-热心居民申请详情接口添加返回字段
|
6 years ago |
|
sunyuchao
|
99c0d0e0ca
|
政府端-组织机构模块-部门接口
|
6 years ago |
|
yinzuomei
|
6d9458afdf
|
oper-crm修改配置1
|
6 years ago |
