jianjun
|
2a8db2bff8
|
Merge remote-tracking branch 'remotes/origin/dev' into shibei_master
|
4 years ago |
yinzuomei
|
c3f83a820e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e1ac737788
|
新增楼宇是户数名词改为总户数，左边树无需计算总户数。
|
4 years ago |
wangxianzhang
|
fe64517809
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
5ed02f594b
|
修复：
1.导入的时候发生调动动作，附加信息表中有数据时产生多余类别变更记录的bug
|
4 years ago |
|
jianjun
|
4dfa3cfa31
|
调大 agg和report
|
4 years ago |
|
yinzuomei
|
b0a0c1df6c
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
|
4 years ago |
|
yinzuomei
|
18b427adcc
|
orgId
|
4 years ago |
|
yinzuomei
|
e8b2168069
|
error
|
4 years ago |
|
yinzuomei
|
56851c9484
|
orgId
|
4 years ago |
|
yinzuomei
|
ff93e1d090
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
|
4 years ago |
|
yinzuomei
|
282df797cc
|
市北的组织pids是英文逗号隔开，先特殊处理下
|
4 years ago |
|
jianjun
|
1d12801b56
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master
|
4 years ago |
|
wangxianzhang
|
c16d31b2d2
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
5f074419ff
|
修复：agency_pids为""的小区，社区查询搜不出来的bug
|
4 years ago |
|
jianjun
|
85039539c8
|
加入市北-居民分类分析数据
|
4 years ago |
|
jianjun
|
e4db1282bd
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master
|
4 years ago |
|
jianjun
|
32348c9797
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_for_ic' into shibei_master
|
4 years ago |
|
jianjun
|
ddd2f21a1f
|
Merge remote-tracking branch 'remotes/origin/dev_ic_diaodong' into shibei_master
# Conflicts:
# epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java
|
4 years ago |
sunyuchao
|
fe53843355
|
Merge branch 'dev_ic_diaodong' into dev
|
4 years ago |
|
sunyuchao
|
a63a048cea
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
sunyuchao
|
4aee21a14c
|
初始新增变更记录数据时18类都为否的也要有变更记录数据只是没有明细数据
|
4 years ago |
|
yinzuomei
|
8c33f2cbf9
|
Merge remote-tracking branch 'origin/dev_optimize_for_ic' into dev
|
4 years ago |
|
wangxianzhang
|
a608e53d7d
|
Merge branch 'dev_ic_diaodong' into dev
|
4 years ago |
|
wangxianzhang
|
e516b3e6b9
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
0d5f36f4b7
|
修复：
1.flyway脚本的字段长度问题fix
|
4 years ago |
zxc
|
dda580447d
|
sql长度
|
4 years ago |
|
yinzuomei
|
fb2e75ab29
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
|
4 years ago |
|
sunyuchao
|
5eb0e8bc53
|
Merge branch 'dev_bug_sb_syc' into dev
|
4 years ago |
|
sunyuchao
|
07513e88e2
|
Merge branch 'dev_bug_sb_syc' into shibei_master
|
4 years ago |
|
sunyuchao
|
e868d491e5
|
社区治理-项目处理分析-右侧地图数据先暂定查询两千条 防止内存溢出
|
4 years ago |
|
jianjun
|
7d6e9852fa
|
修改user内存
|
4 years ago |
|
yinzuomei
|
2b23adaf38
|
社会组织、社区自组织、区域化党建单位未解决的不给分
|
4 years ago |
|
wangxianzhang
|
5c2558f4d7
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_diaodong
|
4 years ago |
|
wangxianzhang
|
1363855c5b
|
修复：
1.居民信息导入的bug
|
4 years ago |
|
zxc
|
9bbe2a350e
|
bug
|
4 years ago |
|
sunyuchao
|
0072644c84
|
数据删除 分批处理
|
4 years ago |
|
sunyuchao
|
65b730a5ae
|
Merge branch 'dev_bug_sb_syc' into dev
|
4 years ago |
|
sunyuchao
|
61331fe011
|
bug修改
|
4 years ago |
zhaoqifeng
|
9ee5f366f7
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
c0a8544306
|
bug
|
4 years ago |
|
zhaoqifeng
|
17aebb4e02
|
事件上报-办结关系修改，办结层级是网格的为自办，不是网格的为上报
|
4 years ago |
|
sunyuchao
|
56e0b68937
|
bug修改
|
4 years ago |
|
yinzuomei
|
5bb47453ac
|
人员类别分析统计库，脚本
|
4 years ago |
|
yinzuomei
|
71bfa90582
|
需求指派社会组织下拉框改为与社会组织列表一致：展示当前工作人员所属组织建立的
|
4 years ago |
|
zxc
|
d00fe79c45
|
旧接口添加新的筛选条件
|
4 years ago |
|
yinzuomei
|
4623a8fe8e
|
/heart/serviceitem/dict-list增加入参type
|
4 years ago |
|
wangxianzhang
|
c2eba4b183
|
Merge branch 'dev' into dev_ic_diaodong
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
fd4cccef30
|
修复：
1.居民信息导入，排除不必要的列的校验
|
4 years ago |
|
wangxianzhang
|
caf71e1e3b
|
修复：
1.调动居民的时候，只增加了调动记录，没增加类别变更记录的bug
|
4 years ago |
