jianjun
|
8d2d25be2e
|
微调
|
4 years ago |
|
jianjun
|
3963916031
|
干掉那个报错的
|
4 years ago |
|
jianjun
|
de4903426d
|
代码清理
|
4 years ago |
|
jianjun
|
27be013b2d
|
日志级别调整
|
4 years ago |
|
jianjun
|
0563b38102
|
日志级别调整
|
4 years ago |
|
jianjun
|
1c87a9d0b8
|
去掉默认赋值根组织中心点
|
4 years ago |
wangxianzhang
|
56ceafd039
|
fix
|
4 years ago |
|
wangxianzhang
|
d46ac4de41
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
wangxianzhang
|
e3bfd50fde
|
修改：
三个接口customerId参数的使用逻辑调整
|
4 years ago |
|
jianjun
|
4b0264ef65
|
去掉 默认跟组织的中心点
|
4 years ago |
|
wangxianzhang
|
0bcb12f842
|
修改：
/screen/index/advancedbranchrank
report/screen/user/partypointrank
user/userpointrank/withoutpartymember
增加customerId可选参数
|
4 years ago |
|
wangxianzhang
|
a3d299884b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
8f0b81b16d
|
修改楼宇排序 先按创建时间 再按楼宇名称；房屋排序将单元号转为数字排
|
4 years ago |
|
wangxianzhang
|
e86f65eb31
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
|
4 years ago |
|
jianjun
|
14487d3f70
|
左侧树也排一下顺序
|
4 years ago |
|
jianjun
|
82f7e51d7b
|
小区 楼宇 房屋 排序
小区创建时间
楼宇 漏洞名称
房屋 单元-门牌号
|
4 years ago |
zhaoqifeng
|
51154424c7
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
266d75f719
|
抽取项目数据到screen_project_*
|
4 years ago |
|
zhaoqifeng
|
4924db329f
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
15122bad11
|
抽取项目数据到screen_project_*
|
4 years ago |
|
jianjun
|
9008ae53a1
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3f9d3fe330
|
巡查最小上报间隔改为3分钟
|
4 years ago |
zxc
|
39c13a0b8c
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev
|
4 years ago |
|
wangxianzhang
|
7d8856dfb7
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
e29db03d3b
|
修改：
1.楼栋管理，楼栋列表排列顺序：按创建时间正序，先添加的在上面，后添加的在下面
|
4 years ago |
|
wangxianzhang
|
74b1680c0f
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_dim_sync
|
4 years ago |
|
wangxianzhang
|
ccb95c5c5c
|
新增：
1.同步漏掉的历史grid，agency,department维度到维度表，查漏补缺
|
4 years ago |
|
zxc
|
173ce4a0ef
|
resibuzz优化查询
|
4 years ago |
|
jianjun
|
be92c16cfd
|
bug修改
|
4 years ago |
|
jianjun
|
b21fa3c943
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_bugfix_ljj
|
4 years ago |
|
wangxianzhang
|
f4c3a6a88a
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
wangxianzhang
|
27362b45cb
|
修改：
auth的serviceListChangedListening选项忘记配置到yml中
|
4 years ago |
|
jianjun
|
393ce22f97
|
数据3版 删掉已经执行的sql
|
4 years ago |
|
jianjun
|
b557ce76ce
|
巡查记录
|
4 years ago |
|
wangxianzhang
|
b26621f899
|
1
|
4 years ago |
|
jianjun
|
f2b8ab3ffc
|
巡查记录添加地址设置
|
4 years ago |
|
wangxianzhang
|
ccdbe0818e
|
修改：
1.因为错误的分之合并，将区块链分支合并到了线上分支，暂时屏蔽掉具体处理，只接受参数
|
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
|
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
|
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
|
f2b26d1e2f
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
3e0b7a4434
|
组织中心点位获取
|
4 years ago |
|
wangxianzhang
|
40cfae724a
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
02002fe33f
|
修改居民excel导入后的文件名
|
4 years ago |
|
zhaoqifeng
|
f6b73d099b
|
Merge branch 'dev_agency_govern_daily' into dev
|
4 years ago |
|
zhaoqifeng
|
22fa5550f7
|
治理指数统计修改
|
4 years ago |
