zxc
|
943ffcff81
|
项目列表微调
|
3 years ago |
jianjun
|
a95f4aca9e
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
jianjun
|
5e47e6b315
|
bug
|
3 years ago |
sunyuchao
|
3e8b89a942
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
# 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/service/IcEventService.java
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
|
3 years ago |
|
sunyuchao
|
f632735c77
|
事件管理_回复
|
3 years ago |
|
zxc
|
8eb0ed5dd9
|
引包修改
|
3 years ago |
HAHA
|
08b9b1c2f3
|
联建单位-简要信息列表补充查询条件
|
3 years ago |
wangxianzhang
|
a635d3d7fb
|
Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili
Conflicts:
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
|
3 years ago |
|
jianjun
|
df98fac9f5
|
返回level
|
3 years ago |
|
wangxianzhang
|
18fda9352b
|
新增：事件处理分析-月增量查询
|
3 years ago |
yinzuomei
|
8988a219c5
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
11914ecb2c
|
duoyuan
|
3 years ago |
|
sunyuchao
|
cab37cae7e
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
sunyuchao
|
96e7242dcb
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
2e6fd2b31f
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
sunyuchao
|
d6b1f0e7e7
|
事件管理_新增
|
3 years ago |
|
yinzuomei
|
06d0d73ad1
|
duoyuan
|
3 years ago |
|
HAHA
|
5ebd3acdab
|
联建单位-简要信息列表
|
3 years ago |
|
yinzuomei
|
abea2ee464
|
duoyuan
|
3 years ago |
|
zxc
|
3115775f62
|
协办单位列表
|
3 years ago |
|
jianjun
|
97912d888d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
jianjun
|
08794a285a
|
添加按行合并策略
|
3 years ago |
|
zxc
|
03590577ec
|
是否处理
|
3 years ago |
|
yinzuomei
|
65504d06a0
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
a73101fe1b
|
暂存
|
3 years ago |
|
sunyuchao
|
b6e8ec88b5
|
事件管理_新增
|
3 years ago |
|
sunyuchao
|
9363d7e3fd
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java
# epmet-module/gov-project/gov-project-server/pom.xml
# 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/impl/IcEventServiceImpl.java
|
3 years ago |
|
zxc
|
28e317b39f
|
分页
|
3 years ago |
wanggongfeng
|
de92d1d020
|
Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
|
3 years ago |
|
wanggongfeng
|
d1e51ea854
|
缴费记录PC接口
|
3 years ago |
|
jianjun
|
cabf2fdf2b
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
3 years ago |
|
jianjun
|
e169fc1c33
|
添加日志排查
|
3 years ago |
|
zxc
|
f2195b56c0
|
满意度评价列表
|
3 years ago |
|
wangxianzhang
|
a3ba7a793f
|
Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili
|
3 years ago |
|
wangxianzhang
|
7ea5371a5b
|
新增：事件处理分析-事件列表
修改：时间处理分析-事件饼图
|
3 years ago |
|
HAHA
|
8e0144c808
|
新增查询条件
|
3 years ago |
|
yinzuomei
|
38f985fda7
|
社区自组织添加分类,导入导出新增修改列表已添加
|
3 years ago |
zhangyuan
|
03a1c88057
|
更新头像的同时更新居民状态
|
3 years ago |
|
zxc
|
624f417fce
|
列表添加条件
|
3 years ago |
|
yinzuomei
|
7fb1c0b8af
|
Merge remote-tracking branch 'origin/dev_zhili' into dev_zhili
|
3 years ago |
|
yinzuomei
|
225d1fe5bb
|
社区自组织添加分类,导入导出新增修改列表已添加
|
3 years ago |
|
jianjun
|
444154fab4
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj'
|
3 years ago |
|
HAHA
|
ddc96d327d
|
格式化代码
|
3 years ago |
|
jianjun
|
6d2661b2c2
|
优化一房一户导出
|
3 years ago |
|
HAHA
|
f5029a74c4
|
量化积分统计
|
3 years ago |
|
HAHA
|
6acddd248f
|
Merge remote-tracking branch 'origin/dev_party_mange' into dev_party_mange
|
3 years ago |
|
zhangyuan
|
adccc66741
|
Merge branch 'dev_move_out_of'
|
3 years ago |
|
zxc
|
a53c16f918
|
项目关闭，流转，响应添加协办单位
|
3 years ago |
zhaoqifeng
|
2b2f94e0c9
|
党员管理增改
|
3 years ago |
|
wangxianzhang
|
91495e5180
|
Merge branch 'dev_zhili' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_zhili
Conflicts:
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/IcEventListResultDTO.java
|
3 years ago |
