jianjun
|
f6f2248e7e
|
条件获取网格工作人员对外及对内 统一接口
|
4 years ago |
sunyuchao
|
1e3a213867
|
人员新增接口调整判断身份证号唯一，新增变更记录、变更明细数据
|
4 years ago |
|
sunyuchao
|
6c5f40867f
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
sunyuchao
|
84fa402af1
|
漏提文件
|
4 years ago |
zxc
|
ab11db590d
|
预警pie
|
4 years ago |
|
sunyuchao
|
2632dd99ca
|
人员调动
|
4 years ago |
wangxianzhang
|
ca8a262a15
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
wangxianzhang
|
83deccbc55
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
e895d2315c
|
新增：
1.社区查询-搜索居民 /icresiuser/search
|
4 years ago |
yinzuomei
|
3574dc636b
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
|
4 years ago |
|
zxc
|
9fa6f05860
|
人员分类管理，常用功能
|
4 years ago |
|
yinzuomei
|
a739d1dfad
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
yinzuomei
|
f7c717741d
|
新建service_item_dict、需求分类删除居民积分+共建部分。删除需求记录sql
|
4 years ago |
|
wangxianzhang
|
1a1cca8aff
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
e24d9db24d
|
新增：
1.社区查询-搜索需求
修复：
2.社区查询-搜索房屋
|
4 years ago |
|
yinzuomei
|
5846ce237a
|
服务事项
|
4 years ago |
zhaoqifeng
|
de23b24991
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
ebbb4539bc
|
新代码生成
删除文件生成顶部renren介绍
|
4 years ago |
|
zxc
|
d1b2889537
|
文件生成服务账户密码修改成root
|
4 years ago |
|
jianjun
|
d6224c4626
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
a48f50b6b7
|
动力网格 市北专属
|
4 years ago |
|
jianjun
|
2a2ce3d23f
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
46fbe3b38f
|
动力网格 市北专属
|
4 years ago |
|
zhaoqifeng
|
c191724ce8
|
项目管理-全部项目列表查询
|
4 years ago |
|
jianjun
|
43d61dde0d
|
动力网格 市北专属
|
4 years ago |
|
wangxianzhang
|
b52c18ff6f
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
83ee95ed24
|
新增：
1.社区查询-搜索房屋
|
4 years ago |
|
zxc
|
564f8ef162
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
6ae241bc3a
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
c21042acc8
|
yitibiaojue
|
4 years ago |
|
sunyuchao
|
8281ad1adb
|
调动、变更记录、变更明细表代码生成
|
4 years ago |
|
zxc
|
534e44f446
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
41e2f9f899
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
3182879841
|
小组组织日统计还原
|
4 years ago |
|
zxc
|
d2c2e5cf03
|
议题表决日统计
|
4 years ago |
|
zxc
|
a3ce3f765c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
d071898560
|
议题统计暂提
|
4 years ago |
|
sunyuchao
|
baf25684a6
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
f4c9672e5b
|
小组机关日统计
|
4 years ago |
|
sunyuchao
|
3fae4181be
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
494f75aa27
|
分页方法调用调整
|
4 years ago |
|
zxc
|
37b526e794
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
|
4 years ago |
|
zxc
|
64620db2ec
|
议题表决日统计
|
4 years ago |
|
jianjun
|
7b0260362d
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3fc9b0b077
|
去掉mock数据
|
4 years ago |
|
jianjun
|
6d1e55e7ca
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_project_catagory' into dev
# Conflicts:
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java
# epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml
|
4 years ago |
|
jianjun
|
c31f526c0b
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
a023ee03eb
|
项目分类分析右侧列表所属网格调整为所属组织
|
4 years ago |
|
sunyuchao
|
6b1b3a4449
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
sunyuchao
|
062a1e5f8d
|
again
|
4 years ago |
