jianjun
|
d77cb8bcb3
|
数据分析v3 up
|
4 years ago |
|
jianjun
|
3447204d32
|
Merge remote-tracking branch 'remotes/origin/dev'
# Conflicts:
# epmet-module/oper-customize/oper-customize-server/pom.xml
|
4 years ago |
|
jianjun
|
ab5f11c2e5
|
Merge remote-tracking branch 'remotes/origin/dev_ic_data' into dev
# Conflicts:
# epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
|
4 years ago |
wangxianzhang
|
31aa37d650
|
新增：
1.ic居民信息导入所用excel模板下载
|
4 years ago |
zxc
|
16c4a9b7d8
|
统计升级
|
4 years ago |
|
zxc
|
9e848d1fcc
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
2efeec31ed
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
d8cefaf5de
|
来源网格的，已结案的项目，满意度分数默认80
|
4 years ago |
|
wangxianzhang
|
ca068bdff3
|
Merge branch 'dev' into dev_ic_data
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
|
jianjun
|
57450e688b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
0e58294aae
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
9dec466f4c
|
组织中心点位获取 up
|
4 years ago |
|
jianjun
|
14c6dee3ee
|
组织中心点位获取 up
|
4 years ago |
|
jianjun
|
e75c6f8fda
|
Merge remote-tracking branch 'origin/master'
|
4 years ago |
|
jianjun
|
26018dd35f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
f2b26d1e2f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3e0b7a4434
|
组织中心点位获取
|
4 years ago |
|
wangxianzhang
|
aaad6d71bc
|
版本升级
|
4 years ago |
|
wangxianzhang
|
5c976afcaf
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
40cfae724a
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
02002fe33f
|
修改居民excel导入后的文件名
|
4 years ago |
zhaoqifeng
|
42e5f85892
|
服务升级
|
4 years ago |
|
zhaoqifeng
|
1c07a3a3c9
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
f6b73d099b
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
|
zhaoqifeng
|
22fa5550f7
|
治理指数统计修改
|
4 years ago |
|
jianjun
|
65c8ee4f22
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
zxc
|
035122db42
|
stats，report升级
|
4 years ago |
|
zxc
|
b75eea1b6c
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
5db2e6c3e6
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
70ac51304c
|
难点堵点分数修改
满意度分数默认值80
|
4 years ago |
|
zhaoqifeng
|
d3656d975a
|
服务升级
|
4 years ago |
|
zhaoqifeng
|
0f37a3ae10
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
1daa6270bb
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
|
zxc
|
13bd6e4340
|
难点堵点加分数字段
|
4 years ago |
sunyuchao
|
13f34035bb
|
应胡科家要求将平阴之前居民端热心居民改为网格员的在改回去，前期要求改的是胡小雷、林伟伟 again
|
4 years ago |
|
sunyuchao
|
b9c039cc92
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
sunyuchao
|
966c89bda1
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
9c115a708e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
sunyuchao
|
e3e33c0b7f
|
应胡科家要求将平阴之前居民端热心居民改为网格员的在改回去，前期要求改的是胡小雷、林伟伟
|
4 years ago |
|
jianjun
|
11680926f8
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
364955346a
|
删除模版
|
4 years ago |
|
zxc
|
5527271138
|
难点堵点加分数字段
|
4 years ago |
yinzuomei
|
d88bb3ea0d
|
135
|
4 years ago |
|
yinzuomei
|
13d10e11f7
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
9bb0ac0dba
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
e2127015c5
|
费钉钉
|
4 years ago |
|
wangxianzhang
|
bc89b763b4
|
版本升级
|
4 years ago |
|
wangxianzhang
|
16fb68f10e
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
wangxianzhang
|
1e44d01054
|
修改：修改居民信息导入成功和失败后，返回excel的文件名
|
4 years ago |
|
wangxianzhang
|
f75b58a12a
|
版本升级
|
4 years ago |
