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 |
yinzuomei
|
1714908110
|
gov-org up
|
4 years ago |
|
yinzuomei
|
2d48911b25
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
c3f83a820e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e1ac737788
|
新增楼宇是户数名词改为总户数，左边树无需计算总户数。
|
4 years ago |
wangxianzhang
|
4c88beac92
|
版本升级
|
4 years ago |
|
wangxianzhang
|
0399483787
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
fe64517809
|
Merge remote-tracking branch 'origin/dev' into dev
|
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 |
|
jianjun
|
c961bba8d0
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
4dfa3cfa31
|
调大 agg和report
|
4 years ago |
|
yinzuomei
|
7d772fb2c2
|
temp
|
4 years ago |
|
yinzuomei
|
e1af1cc588
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
b0a0c1df6c
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
|
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
|
5cbcb25fee
|
党员7
|
4 years ago |
|
yinzuomei
|
081db1d8d8
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
ff93e1d090
|
Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev
|
4 years ago |
|
yinzuomei
|
282df797cc
|
市北的组织pids是英文逗号隔开，先特殊处理下
|
4 years ago |
|
wangxianzhang
|
804eedf36d
|
版本升级
|
4 years ago |
|
wangxianzhang
|
63c4aed7d9
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
08fccf32db
|
加入市北-居民分类分析数据 up
|
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 |
sunyuchao
|
9af8088e41
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
fada3d2dc8
|
Merge branch 'dev_ic_diaodong' into develop
|
4 years ago |
|
sunyuchao
|
cd4d4b435a
|
again
|
4 years ago |
|
sunyuchao
|
a7d48d0694
|
Merge branch 'dev'
|
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
|
3eca679ef6
|
foric 小区管理showName
|
4 years ago |
|
yinzuomei
|
8af1a68285
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
8c33f2cbf9
|
Merge remote-tracking branch 'origin/dev_optimize_for_ic' into dev
|
4 years ago |
|
wangxianzhang
|
23cc365499
|
版本升级
|
4 years ago |
|
wangxianzhang
|
a75abc1e23
|
Merge branch '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 |
