yinzuomei
|
9323769aa6
|
列表返回总结标志，详情返回总结内容
|
3 years ago |
zxc
|
3ca44aeb98
|
时间修改
|
3 years ago |
|
yinzuomei
|
0bf8508ed3
|
Merge remote-tracking branch 'origin/dev_new_article' into dev_new_article
|
3 years ago |
|
yinzuomei
|
74a5bcc082
|
活动详情
|
3 years ago |
|
zxc
|
ff9f8459e5
|
Merge remote-tracking branch 'origin/dev_new_article' into dev_new_article
|
3 years ago |
|
zxc
|
b22c87134d
|
党建声音暂存一波
|
3 years ago |
sunyuchao
|
2c02614be1
|
方法模板
|
3 years ago |
|
sunyuchao
|
29ba18680a
|
文章详情
|
3 years ago |
|
yinzuomei
|
607958e1cc
|
列表
|
3 years ago |
|
sunyuchao
|
2293434b95
|
漏提文件
|
3 years ago |
|
sunyuchao
|
1337edbf88
|
表字段调整
|
3 years ago |
|
sunyuchao
|
9b434b0d56
|
数字平台-党建声音-文章列表
|
3 years ago |
|
sunyuchao
|
499c0f54e9
|
Merge branch 'dev_5big_coverage'
|
3 years ago |
|
sunyuchao
|
2ac9f2efa9
|
优势资源、城市管理、重点危化、公共服务导入时同组织下名称唯一，已有数据直接更新,未改彻底，二次修改
|
3 years ago |
jianjun
|
b0ed376716
|
Merge remote-tracking branch 'remotes/origin/dev_rf_syc'
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
# epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml
|
3 years ago |
|
sunyuchao
|
1a23fb8c34
|
Merge branch 'dev_5big_coverage'
|
3 years ago |
|
sunyuchao
|
107872b7cd
|
Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
|
3 years ago |
|
sunyuchao
|
37b5ab6ddd
|
优势资源、城市管理、重点危化、公共服务导入时同组织下名称唯一，已有数据直接更新
|
3 years ago |
|
zxc
|
0acf4d2a14
|
Merge branch 'dev_bugfix_ljj'
|
3 years ago |
|
zxc
|
c9a8b4c31f
|
社区查询首页右侧列表
|
3 years ago |
|
yinzuomei
|
53b5c4db37
|
Merge remote-tracking branch 'origin/dev_5big_coverage'
|
3 years ago |
|
yinzuomei
|
0875fd93db
|
update
|
3 years ago |
|
yinzuomei
|
dd4b8b7fce
|
社区自组织address
|
3 years ago |
|
sunyuchao
|
1bdb941b50
|
Merge branch 'dev_5big_coverage'
|
3 years ago |
|
yinzuomei
|
9185f4567c
|
Merge remote-tracking branch 'origin/dev_5big_coverage' into dev_5big_coverage
|
3 years ago |
|
yinzuomei
|
bf8321e225
|
报错
|
3 years ago |
|
sunyuchao
|
357e8d427f
|
生产bug修改
|
3 years ago |
wangxianzhang
|
7a3c8d91b8
|
Merge branches 'dev_5big_coverage', 'master' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
63727808e2
|
-
|
3 years ago |
|
wangxianzhang
|
920286940e
|
Merge branches 'dev_5big_coverage' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
6e36107a9c
|
-
|
3 years ago |
|
wangxianzhang
|
1fb34937ba
|
Merge branches 'dev_5big_coverage' and 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
wangxianzhang
|
5245c449c0
|
【五大图层】按照图层-placeType-sort排序，将同一个placeType排到一起
|
3 years ago |
|
jianjun
|
2c7df223d7
|
Merge remote-tracking branch 'remotes/origin/dev_5big_coverage'
|
3 years ago |
|
wangxianzhang
|
a670cc6b96
|
【五大图层】修复：特殊人群社区矫正列表数量与居民信息中不对应（因为status=0正常缺少条件）；修复：群租房缺少"rent_flag"条件
|
3 years ago |
YUJT
|
1ca4683a29
|
Merge branch 'feature/dev_sunjiatan_moveout'
|
3 years ago |
|
jianjun
|
d99854e712
|
Merge remote-tracking branch 'remotes/origin/dev_5big_coverage'
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
|
3 years ago |
|
jianjun
|
9961f16461
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
1c7b7ecad5
|
bug
|
3 years ago |
zhaoqifeng
|
36cac46679
|
迁出逻辑修改
|
3 years ago |
|
jianjun
|
d6c8159347
|
bug
|
3 years ago |
|
jianjun
|
87a46ea9c3
|
bug
|
3 years ago |
|
jianjun
|
60e0cc73eb
|
bug
|
3 years ago |
|
wangxianzhang
|
cba5be0cb1
|
Merge remote-tracking branch 'origin/master'
|
3 years ago |
|
wangxianzhang
|
ad3d556678
|
【居民信息导入】修复:兼容cascader空间的bug
|
3 years ago |
|
jianjun
|
ff34a61581
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
YUJT
|
6f64dc05a0
|
Merge branch 'feature/dev_sunjiatan_moveout'
|
3 years ago |
|
YUJT
|
13e0c5ae1d
|
Merge branch 'dev_party_mange'
|
3 years ago |
|
zhaoqifeng
|
028d568c87
|
驳回原因不能为空
(cherry picked from commit e95168c269)
|
3 years ago |
|
jianjun
|
3306411c39
|
一个人多个角色 bug 导致的问题
|
3 years ago |
