jianjun
|
018616a4d8
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
|
jianjun
|
9cd449a6df
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop
|
4 years ago |
|
jianjun
|
4b5f6d65ab
|
居民类别分析中 优化查询 pids like 错误
|
4 years ago |
|
jianjun
|
767aeb5495
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop
|
4 years ago |
|
jianjun
|
fe3f5c682a
|
居民类别分析中 优化查询 空指针判断
|
4 years ago |
|
jianjun
|
84b92979ed
|
Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java
# epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcStatsResiWarnDao.java
# epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml
|
4 years ago |
|
jianjun
|
e9ff18cd60
|
居民类别分析中 优化查询
|
4 years ago |
wangxianzhang
|
14d7efe82a
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
10bc2d327a
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wangxianzhang
|
5ed02f594b
|
修复：
1.导入的时候发生调动动作，附加信息表中有数据时产生多余类别变更记录的bug
|
4 years ago |
yinzuomei
|
9a2a533be0
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
0ebe87ae0a
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
18b427adcc
|
orgId
|
4 years ago |
|
yinzuomei
|
2c4d724fa6
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
1e63e16a5a
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
e8b2168069
|
error
|
4 years ago |
|
yinzuomei
|
428f866d94
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
b51977d3c7
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
56851c9484
|
orgId
|
4 years ago |
|
yinzuomei
|
282df797cc
|
市北的组织pids是英文逗号隔开，先特殊处理下
|
4 years ago |
|
wangxianzhang
|
5f074419ff
|
修复：agency_pids为""的小区，社区查询搜不出来的bug
|
4 years ago |
sunyuchao
|
9af8088e41
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
fada3d2dc8
|
Merge branch 'dev_ic_diaodong' into develop
|
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 |
|
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
|
0029f59f1f
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
49240eec47
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
yinzuomei
|
2b23adaf38
|
社会组织、社区自组织、区域化党建单位未解决的不给分
|
4 years ago |
|
wangxianzhang
|
5bd9ea94d2
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
wangxianzhang
|
3998294414
|
Merge branch 'dev_ic_diaodong' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
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
|
f7c19675d8
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
5e1c95a0eb
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
9bbe2a350e
|
bug
|
4 years ago |
|
sunyuchao
|
209a722984
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
277e26d524
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
0072644c84
|
数据删除 分批处理
|
4 years ago |
|
sunyuchao
|
eea9208cd5
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
6dd2abe727
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
61331fe011
|
bug修改
|
4 years ago |
|
zxc
|
980d37a7eb
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
3c872cbb37
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into develop
|
4 years ago |
|
zxc
|
c0a8544306
|
bug
|
4 years ago |
|
sunyuchao
|
446bdd92f2
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
92c65d9be4
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
56e0b68937
|
bug修改
|
4 years ago |
