jianjun
|
0645819bc4
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
|
5 years ago |
|
jianjun
|
da43c4bec2
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
5 years ago |
|
jianjun
|
0cc2749012
|
添加日志拍错
|
5 years ago |
zxc
|
c6fa327691
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp
|
5 years ago |
|
zxc
|
a9c2d2d873
|
11
|
5 years ago |
|
zxc
|
bb59267dfa
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp
|
5 years ago |
|
zxc
|
584667dff9
|
..
|
5 years ago |
|
zxc
|
6469f920b3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp
|
5 years ago |
|
zxc
|
dcfbacee77
|
street
|
5 years ago |
sunyuchao
|
acd2135f99
|
Merge branch 'dev_third_data' into dev_temp
|
5 years ago |
|
sunyuchao
|
0b188fcd83
|
治理指数bug修改
|
5 years ago |
|
zxc
|
aa479927f5
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp
|
5 years ago |
|
zxc
|
8b87492813
|
。
|
5 years ago |
|
zxc
|
9af3fbc6e6
|
街道 能力指数计算修改
|
5 years ago |
yinzuomei
|
4896097502
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
5 years ago |
|
yinzuomei
|
5250204b5c
|
治理指数-网格调试1
|
5 years ago |
|
jianjun
|
38bb448d60
|
Merge remote-tracking branch 'remotes/origin/dev_group_point' into dev
|
5 years ago |
|
sunyuchao
|
ce9049445f
|
Merge branch 'dev_notic_bug_syc' into dev
|
5 years ago |
|
sunyuchao
|
7fb2c0fa99
|
生产通知已读未读bug修改
|
5 years ago |
|
jianjun
|
7a48624a2f
|
数据3.0 添加修改权重脚本
|
5 years ago |
|
zxc
|
f7205c599c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp
|
5 years ago |
|
zxc
|
7bcaae2934
|
街道级别代码微调
|
5 years ago |
|
jianjun
|
52209fb392
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
|
5 years ago |
|
jianjun
|
8fb5a3f10c
|
添加脚本
|
5 years ago |
|
sunyuchao
|
5d7215fcf0
|
Merge branch 'dev_notic_bug_syc' into dev_temp
|
5 years ago |
|
sunyuchao
|
cf7c2355b3
|
Merge branch 'dev_notic_bug_syc' into dev
|
5 years ago |
|
zxc
|
87682249bf
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
|
5 years ago |
|
sunyuchao
|
de7694f05b
|
日志bug修改
|
5 years ago |
zhaoqifeng
|
10a59e830b
|
Merge branch 'dev_out_group' into dev
# Conflicts:
# epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
|
5 years ago |
|
zhaoqifeng
|
72b485b7bd
|
Merge branch 'dev_topic_locate' into dev
|
5 years ago |
|
zhaoqifeng
|
566c160ad4
|
基层治理-组织的治理指数，按天统计
|
5 years ago |
|
zxc
|
e14725ea65
|
community级别 能力指数修改
|
5 years ago |
|
yinzuomei
|
9a3907c3d6
|
Merge remote-tracking branch 'origin/dev_third_data' into dev_third_data
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
|
5 years ago |
|
yinzuomei
|
d894dd37e1
|
治理指谁网格相关v3: 网格自治占比：本网格内产生的项目，并且一直在网格级流转的项目，从哪出来归谁自治；社区、街道、区直部门解决都是指的，从本网格内出来的项目中，再去看谁解决
|
5 years ago |
|
sunyuchao
|
2f4337fdba
|
运营端获取小程序草稿箱接口设置按草稿创建时间降序
|
5 years ago |
|
jianjun
|
b1c42d3bbe
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
5 years ago |
|
jianjun
|
1656ce8f68
|
bug
|
5 years ago |
|
sunyuchao
|
4363bba734
|
Merge branch 'dev_notic_bug_syc' into dev_temp
|
5 years ago |
|
sunyuchao
|
0933e20a74
|
活动。通知用户已读未读状态取VIEW_DETAIL字段值，组长看未读人数取READ_FLAG字段值
|
5 years ago |
|
jianjun
|
fe87ae2e5e
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_temp
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml
|
5 years ago |
|
jianjun
|
25d4987a95
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
5 years ago |
|
jianjun
|
c5e6262187
|
本级和下级分数 保留一位小数
|
5 years ago |
|
zxc
|
d8c32d1824
|
全区能力指数修改
|
5 years ago |
|
sunyuchao
|
d2ed5b35f2
|
Merge branch 'dev_notic_bug_syc' into dev_temp
|
5 years ago |
|
sunyuchao
|
a86aaae641
|
bug修改
|
5 years ago |
|
zhaoqifeng
|
431d93a549
|
Merge branch 'dev_group_point' into dev_temp
|
5 years ago |
|
zhaoqifeng
|
0a2fcd9de2
|
成就轮播修改
|
5 years ago |
|
zhaoqifeng
|
c434ad6a9c
|
基层治理-组织的治理指数，按天统计
|
5 years ago |
|
jianjun
|
33ce7ee4f5
|
Merge remote-tracking branch 'remotes/origin/dev_third_data' into dev_temp
|
5 years ago |
|
jianjun
|
6f5c7b5375
|
特殊处理下%d
|
5 years ago |
