jianjun
|
228e27f60e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/pom.xml
|
4 years ago |
|
jianjun
|
e1d047ffa3
|
组织及网格去掉 默认跟组织的中心点
|
4 years ago |
|
jianjun
|
f0c71b4cab
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
Conflicts:
epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
epmet-module/data-report/data-report-server/pom.xml
|
4 years ago |
|
jianjun
|
beac655851
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
4b0264ef65
|
去掉 默认跟组织的中心点
|
4 years ago |
wangxianzhang
|
0db2588a93
|
版本升级
|
4 years ago |
|
wangxianzhang
|
6360128fd2
|
Merge branch 'dev'
# Conflicts:
# epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml
# epmet-module/data-report/data-report-server/pom.xml
|
4 years ago |
|
wangxianzhang
|
5efb0bf3e1
|
版本升级
|
4 years ago |
|
wangxianzhang
|
0bcb12f842
|
修改：
/screen/index/advancedbranchrank
report/screen/user/partypointrank
user/userpointrank/withoutpartymember
增加customerId可选参数
|
4 years ago |
|
wangxianzhang
|
51a5a02319
|
版本升级
|
4 years ago |
|
wangxianzhang
|
4db520285a
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
a3d299884b
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
fbde89c7b7
|
修改楼宇排序 先按创建时间 再按楼宇名称；房屋排序将单元号转为数字排 up
|
4 years ago |
|
jianjun
|
3d95060611
|
Merge remote-tracking branch 'remotes/origin/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
|
106d03f581
|
服务升级
|
4 years ago |
|
zhaoqifeng
|
8d8f94a58d
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
51154424c7
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
266d75f719
|
抽取项目数据到screen_project_*
|
4 years ago |
|
zhaoqifeng
|
eccf275be6
|
服务升级
|
4 years ago |
|
zhaoqifeng
|
1af2109812
|
Merge branch 'dev'
|
4 years ago |
|
zhaoqifeng
|
4924db329f
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
zhaoqifeng
|
15122bad11
|
抽取项目数据到screen_project_*
|
4 years ago |
|
jianjun
|
fe4ef78001
|
恢复原有的字段
|
4 years ago |
|
jianjun
|
34ca3d902a
|
例行工作 flyway 脚本
|
4 years ago |
|
jianjun
|
abfb1eb13a
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_grid_user_work
|
4 years ago |
|
jianjun
|
97d6b70289
|
例行工作添加接口
|
4 years ago |
|
jianjun
|
5bda526622
|
巡查最小上报间隔改为3分钟 up 12：00
|
4 years ago |
|
jianjun
|
2c7ef2cfdf
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
5f41e4cdc9
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
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 |
|
jianjun
|
2f916a7fee
|
多一个属性 怕啥
|
4 years ago |
zxc
|
9d6c5dd7f4
|
issue升级
|
4 years ago |
|
zxc
|
94196b7793
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
39c13a0b8c
|
Merge remote-tracking branch 'origin/dev_ic_data' into dev
|
4 years ago |
|
jianjun
|
a6bf321d35
|
去掉还不行 那就返回吧
|
4 years ago |
|
jianjun
|
b3307783b9
|
添加例行工作暂存
|
4 years ago |
|
jianjun
|
416640b36d
|
系统字典添加 返回pValue
|
4 years ago |
|
wangxianzhang
|
b29af47d56
|
版本升级
|
4 years ago |
|
wangxianzhang
|
453a9e5b3f
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
7d8856dfb7
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
e29db03d3b
|
修改：
1.楼栋管理，楼栋列表排列顺序：按创建时间正序，先添加的在上面，后添加的在下面
|
4 years ago |
|
jianjun
|
0eb3a67001
|
系统字典添加 获取树形结构的方法
|
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 |
|
jianjun
|
96e9a3cc37
|
系统字典添加 获取树形结构的方法
|
4 years ago |
