sunyuchao
|
9cf60f5725
|
Merge branch 'dev_govgrid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govgrid
|
6 years ago |
|
sunyuchao
|
d8f9a6a6f7
|
居民端-代码优化-不引用server服务
|
6 years ago |
zxc
|
a5beb0e2ec
|
已认证党员详情
|
6 years ago |
yinzuomei
|
1883d302ee
|
Merge remote-tracking branch 'origin/dev_govgrid' into dev
|
6 years ago |
|
sunyuchao
|
34c3786f41
|
修改Constant类存放位置
|
6 years ago |
|
sunyuchao
|
abd5bc9802
|
Merge branch 'dev_govgrid' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govgrid
|
6 years ago |
|
sunyuchao
|
a5bad0ebc6
|
居民端-热心居民申请提交-添加给对应网格长发送消息的逻辑
|
6 years ago |
|
yinzuomei
|
42757f8d7b
|
customer_grid表删除org_id
|
6 years ago |
|
zxc
|
59ca5cc03f
|
网格名称修改bug修复
|
6 years ago |
|
zxc
|
a7341b8629
|
修改查询已认证党员
|
6 years ago |
wxz
|
4340e7116c
|
1.修改@Datafilter注解，将tableAlias修改为数组，预留出来，为后面的多表过滤做准备
|
6 years ago |
wangchao
|
4aa5bc205c
|
查找可选人员列表接口Bug修复
|
6 years ago |
zhaoqifeng
|
929f7c5e04
|
政府端党员认证相关接口
|
6 years ago |
|
wangchao
|
f076aa4415
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
wangchao
|
67bf61d209
|
查找可选人员列表接口Bug修复
|
6 years ago |
|
zxc
|
3f3d7de1d3
|
网格名称修改bug修复
|
6 years ago |
|
wxz
|
20b668b0e4
|
Merge branch 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
6 years ago |
|
wxz
|
ee5b60c2c7
|
1.修改@Datafilter注解，将tableAlias修改为数组，预留出来，为后面的多表过滤做准备
|
6 years ago |
|
zxc
|
40980527f6
|
修改查询已认证党员
|
6 years ago |
|
yinzuomei
|
44415109d5
|
user,govorg发版
|
6 years ago |
|
wangchao
|
9ee7003a28
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
|
6 years ago |
|
wangchao
|
f0211219c0
|
查询网格列表Bug修复
|
6 years ago |
|
wxz
|
32106034a3
|
1.修改DataFilter，弃用DataScope传参方式，改用ThreadLocal方式
|
6 years ago |
|
yinzuomei
|
c37036daf0
|
govgrid编译错误解决
|
6 years ago |
|
yinzuomei
|
ddd619e127
|
服务统一升级
|
6 years ago |
|
yinzuomei
|
fca4a97c48
|
待审核党员列表，审核历史接口修改
|
6 years ago |
|
wangchao
|
2b651121ce
|
Merge remote-tracking branch 'origin/dev_govorg' into dev_govorg
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/redis/ResiGroupMemberRedis.java
|
6 years ago |
|
zxc
|
207b4cf00c
|
已认证党员查询
|
6 years ago |
|
wangchao
|
5eda827981
|
删除无用注释
|
6 years ago |
|
yinzuomei
|
2a90464e0d
|
Merge branches 'dev' and 'dev_govorg' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_govorg
|
6 years ago |
|
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 |
