zxc
|
c91c94d833
|
时间按照实际结束时间
|
4 years ago |
|
zxc
|
5b1585a234
|
Merge remote-tracking branch 'origin/develop' into develop
|
4 years ago |
|
zxc
|
2c557df98f
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
|
4 years ago |
sunyuchao
|
2ed055c6c6
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
zxc
|
58eb90af5d
|
修改巡查时间格式
|
4 years ago |
|
sunyuchao
|
4b4d866aa6
|
查询当前组织是不是跟组织添加客户Id查询条件
|
4 years ago |
jianjun
|
3f284db455
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
|
4 years ago |
|
jianjun
|
d633cf201d
|
网格员巡查统计脚本添加
|
4 years ago |
yinzuomei
|
0a5b552da3
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
yinzuomei
|
99a91d01a2
|
candidateList
|
4 years ago |
|
yinzuomei
|
332c6f1851
|
rollback
|
4 years ago |
|
jianjun
|
dd60be189a
|
Merge remote-tracking branch 'remotes/origin/dev_patrol_stats' into develop
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java
# epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml
|
4 years ago |
|
jianjun
|
ab0fe9ddad
|
网格员巡查统计初始化几重新计算代码
|
4 years ago |
|
yinzuomei
|
5e279b8ae5
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
aa83c9f476
|
rollback
|
4 years ago |
|
sunyuchao
|
dd001f8e5d
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
sunyuchao
|
44ccd40122
|
居民端首页推荐小组不展示支部组
|
4 years ago |
|
yinzuomei
|
d2c4e3e559
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
aeaf88daa9
|
去掉试试
|
4 years ago |
|
yinzuomei
|
90f37d8130
|
sl
|
4 years ago |
zhaoqifeng
|
d8cffc1be0
|
Merge branch 'dev_oper_role' into develop
|
4 years ago |
|
zhaoqifeng
|
9556bd1a55
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
zhaoqifeng
|
9b45488216
|
治理指数数据查询接口修改
|
4 years ago |
|
zhaoqifeng
|
4842828f77
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
zhaoqifeng
|
d7a92f2f92
|
治理指数数据查询接口修改
|
4 years ago |
|
zhaoqifeng
|
7771142c70
|
治理指数数据查询接口修改
|
4 years ago |
|
yinzuomei
|
8407fe1cc0
|
temp
|
4 years ago |
wxz
|
aacefc07f1
|
Merge branches 'develop' and 'wxz_permission_async' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
wxz
|
dc0f0adc65
|
新增：为所有客户同步指定角色，指定操作，(从默认配置中取)
|
4 years ago |
|
zhaoqifeng
|
3696853d63
|
工作人员角色添加说明
|
4 years ago |
|
yinzuomei
|
251648da70
|
测试生产都已经执行
|
4 years ago |
|
sunyuchao
|
52184175d8
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
sunyuchao
|
341bf49319
|
代码还原
|
4 years ago |
|
sunyuchao
|
c9a0650fef
|
Merge branch 'dev_data_fusion' into develop
|
4 years ago |
|
sunyuchao
|
d0b9b1ae4c
|
Merge remote-tracking branch 'origin/dev_data_fusion' into dev_data_fusion
|
4 years ago |
|
sunyuchao
|
33f436d9af
|
程序调整测试
|
4 years ago |
|
yinzuomei
|
425d02b645
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
yinzuomei
|
05802eb111
|
projectCreateTime_1
|
4 years ago |
|
zxc
|
b2a4a1285e
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
|
4 years ago |
|
zxc
|
ded4170c88
|
..
|
4 years ago |
|
wxz
|
59479f8655
|
Merge branches 'develop' and 'wxz_permission_async' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
yinzuomei
|
41e813e8c9
|
Merge remote-tracking branch 'origin/dev_data_fusion' into develop
|
4 years ago |
|
wxz
|
4784673284
|
修复：FieldMetaObject#getCustomerId方法，增加空字符串的判断
|
4 years ago |
|
yinzuomei
|
b98e62e717
|
projectCreateTime
|
4 years ago |
|
zxc
|
981f80d6a3
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
|
4 years ago |
|
zxc
|
3985d96e5d
|
巡查
|
4 years ago |
|
jianjun
|
05b972456d
|
初始化数据代码
|
4 years ago |
|
yinzuomei
|
25eec3e1ee
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
wxz
|
4929d451cc
|
Merge branches 'dev' and 'wxz_permission_async' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_permission_async
|
4 years ago |
|
zxc
|
003aea28c4
|
Merge remote-tracking branch 'origin/dev_patrol_stats' into develop
|
4 years ago |
