sunyuchao
|
1d8ad538ae
|
解决代码被人覆盖问题以及所有接口返参不允许出现null问题
|
6 years ago |
yinzuomei
|
5fdaf6c62c
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
# Conflicts:
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.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/impl/CustomerGridServiceImpl.java
|
6 years ago |
|
yinzuomei
|
34bd289746
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
|
6 years ago |
|
yinzuomei
|
9a50e7fc27
|
冲突解决
|
6 years ago |
|
yinzuomei
|
57f93b0e6a
|
冲突解决
|
6 years ago |
|
yinzuomei
|
17588ca852
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/ResiTopicController.java
|
6 years ago |
|
sunyuchao
|
cda2ef7bad
|
地区编码字段由int改为string
|
6 years ago |
|
yinzuomei
|
1e52eaa365
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
# Conflicts:
# epmet-module/gov-mine/gov-mine-server/src/main/java/com/epmet/feign/GovAccessFeignClient.java
|
6 years ago |
|
yinzuomei
|
a281bee5c3
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev_govgrid
|
6 years ago |
|
yinzuomei
|
f46d0fbc0b
|
partymember_confirm_manual添加read_flag,党员认证审核历史接口、查询待审核接口开发
|
6 years ago |
|
sunyuchao
|
2d84ce7787
|
政府端-组织、部门模块程序优化
|
6 years ago |
wangchao
|
8bb23839b1
|
政府端话题管理相关接口
|
6 years ago |
wxz
|
a94e444182
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
# Conflicts:
# 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/service/DepartmentService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java
|
6 years ago |
|
wxz
|
292a867842
|
1.去除FeignClient的url
|
6 years ago |
|
wxz
|
ab98d22c1f
|
1.基本完成了权限部分，除上级，同级其他，我参与的
|
6 years ago |
|
wangchao
|
225058e2a0
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
# Conflicts:
# 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/DepartmentService.java
# epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.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 |
|
wangchao
|
bd4c80705b
|
网格管理、部门管理接口相关
|
6 years ago |
|
yinzuomei
|
bed38d9f95
|
user0.3.4,gov0.3.6发版
|
6 years ago |
|
yinzuomei
|
c61ba9a930
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
|
6 years ago |
zhaoqifeng
|
bc7fcbca7c
|
customer_staff表结构修改
|
6 years ago |
|
zhaoqifeng
|
63e16b80d9
|
组织-工作人员相关接口 bug修改
|
6 years ago |
|
yinzuomei
|
e0a8ccaa18
|
govorg,user发版
|
6 years ago |
|
yinzuomei
|
02fa3d5e28
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
|
6 years ago |
|
yinzuomei
|
2b470a9efb
|
党员认证-接口入口初始化service
|
6 years ago |
|
yinzuomei
|
0050dd53b1
|
feignurl去除localhost
|
6 years ago |
|
sunyuchao
|
f9c6972ea5
|
政府端-接口自测程序修改
|
6 years ago |
|
sunyuchao
|
37bdf01c14
|
Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
6 years ago |
|
sunyuchao
|
add02f0210
|
数据库字段类型变动
|
6 years ago |
|
yinzuomei
|
4d733c7db9
|
- /auth/gov/loginwxmp/loginout配置拦截
|
6 years ago |
|
yinzuomei
|
dc4769ffba
|
- /auth/gov/loginwxmp/loginout配置拦截
|
6 years ago |
|
yinzuomei
|
3551dd91f5
|
党员认证-接口入口
|
6 years ago |
|
yinzuomei
|
0c87e7363a
|
govorg0.3.4获取我的组织接口发版
|
6 years ago |
|
yinzuomei
|
3ac2ee220e
|
Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
6 years ago |
|
yinzuomei
|
de90ddcbd3
|
getMyOrg接口修改发版测试1
|
6 years ago |
|
yinzuomei
|
801b33ada8
|
getMyOrg接口修改发版测试
|
6 years ago |
|
yinzuomei
|
36c155d779
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
|
6 years ago |
|
yinzuomei
|
1a7d769139
|
getMyOrg接口修改
|
6 years ago |
zxc
|
b85a33b229
|
网格名称重复问题
|
6 years ago |
|
yinzuomei
|
13e8390b90
|
govorg,epmetuser0.3.2
|
6 years ago |
|
yinzuomei
|
f9c83f6b24
|
Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
6 years ago |
|
zxc
|
46d7f7ff76
|
网格删除修改
|
6 years ago |
|
yinzuomei
|
fa5ad036e5
|
0.3.1版本
|
6 years ago |
|
yinzuomei
|
b6cee29165
|
0.3.1版本
|
6 years ago |
|
yinzuomei
|
70853b9aed
|
合并冲突解决
|
6 years ago |
|
yinzuomei
|
e116cfda49
|
Merge remote-tracking branch 'origin/dev_govorg' into dev
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java
# epmet-gateway/pom.xml
# epmet-gateway/src/main/resources/bootstrap.yml
# 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/pom.xml
|
6 years ago |
|
yinzuomei
|
906cc8957c
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
|
sunyuchao
|
4582b9f364
|
调用查询角色方法添加参数问题
|
6 years ago |
|
sunyuchao
|
c3ced08293
|
政府端-接口添加token参数
|
6 years ago |
|
sunyuchao
|
89b25585f5
|
Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
6 years ago |
|
sunyuchao
|
54294a9ed1
|
政府端-部门模块代码补漏
|
6 years ago |
