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 |
|
yinzuomei
|
05e6b91079
|
Merge remote-tracking branch 'origin/dev' into dev
|
6 years ago |
|
yinzuomei
|
c76e54c4e5
|
oper-crm修改配置
|
6 years ago |
|
yinzuomei
|
d257127e9c
|
切换网格v2
|
6 years ago |
|
yinzuomei
|
91a4dbe6f7
|
冲突解决
|
6 years ago |
|
yinzuomei
|
61fd70f885
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
# Conflicts:
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StaffGridVisitedController.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/StaffGridVisitedService.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffGridVisitedServiceImpl.java
|
6 years ago |
|
yinzuomei
|
b76bbcde6a
|
切换网格v1
|
6 years ago |
|
wangchao
|
d609f4719d
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
wangchao
|
9e29864e38
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
# Conflicts:
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/controller/StaffAgencyController.java
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/EpmetUserFeignClientFallback.java
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/fallback/GovOrgFeignClientFallBack.java
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/StaffAgencyService.java
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/service/impl/StaffAgencyServiceImpl.java
|
6 years ago |
|
wxz
|
49018cbcc9
|
1.StaffRoleController内方法 url大小写调整
|
6 years ago |
|
wangchao
|
c169baa59f
|
政府工作人员获取上一次登录的网格信息
|
6 years ago |
|
wxz
|
d5edd5952b
|
1.查询用户有权限的操作列表
|
6 years ago |
|
yinzuomei
|
99f4ad89fc
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
yinzuomei
|
f243849a3c
|
切换网格初始提交
|
6 years ago |
|
zhaoqifeng
|
a3c60823e9
|
修改 获取最近一次登录的客户信息
|
6 years ago |
|
zhaoqifeng
|
95dad66035
|
修改 获取最近一次登录的客户信息
|
6 years ago |
|
zhaoqifeng
|
c55ca2d106
|
修改 获取最近一次登录的客户信息
|
6 years ago |
|
sunyuchao
|
c7c2ce05be
|
customer_agency表添加字段对应实体添加属性字段
|
6 years ago |
|
wxz
|
6fa3ed19b8
|
1.修改pom版本
|
6 years ago |
|
wxz
|
4c29ed52a7
|
1.新增：查询客户footbar接口
|
6 years ago |
