wangxianzhang
|
82b8ede3bb
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
6167404194
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
wangxianzhang
|
47c9e92540
|
修改：
1.CustomerOrgRedis中未找到网格不抛异常，改由业务代码处理
|
4 years ago |
yinzuomei
|
5927e8d961
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
de8c8f1dfd
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
f5f8ab73b9
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
d13d886d0a
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
c7ab35741b
|
查询修改下，赋值areaName
|
4 years ago |
|
wangxianzhang
|
fb5e8dbf57
|
版本升级
|
4 years ago |
|
wangxianzhang
|
cac1ad19ee
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
fcc25cdce8
|
Merge branch 'dev_routine_work' into dev
|
4 years ago |
|
wangxianzhang
|
ae19eea8e2
|
修改：
1.工作人员工作统计：导出excel，bean中数据类型修改
|
4 years ago |
jianjun
|
2c0cbce0b7
|
report stats heart job msg point org user
|
4 years ago |
|
yinzuomei
|
8aea495623
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
04a868e0fb
|
根组织不修改areaCode
|
4 years ago |
|
yinzuomei
|
ba13a95a21
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
8cdeaa6ead
|
bugfix
|
4 years ago |
|
jianjun
|
0fb2d7f317
|
agg ,ISSUE，project，guide ，hall
|
4 years ago |
|
yinzuomei
|
43a3797d1e
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
jianjun
|
4d0251a5a7
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
yinzuomei
|
b6e0edfe4b
|
修改组织测试下
|
4 years ago |
|
jianjun
|
46b332bdf1
|
Merge remote-tracking branch 'remotes/origin/dev_ic_mp' into dev
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectTraceServiceImpl.java
|
4 years ago |
|
wangxianzhang
|
995294fd6f
|
Merge branch 'wxz_blockchain' into develop
|
4 years ago |
|
wangxianzhang
|
ca536461f2
|
修改：
1.third bc dto实现序列化
|
4 years ago |
|
yinzuomei
|
81189c3ed9
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
369ebffaff
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
deade0aeff
|
修改组织测试下
|
4 years ago |
|
jianjun
|
f38aa56182
|
网格员工作数据统计up
|
4 years ago |
|
wangxianzhang
|
c0e8ca91a3
|
Merge branch 'wxz_blockchain' into develop
|
4 years ago |
|
wangxianzhang
|
1498bc16c9
|
修改：
1.区块链上链调用third feign失败的测试
|
4 years ago |
|
jianjun
|
3b99e27ba7
|
网格员工作数据统计up
|
4 years ago |
|
jianjun
|
b5d35086ca
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
sunyuchao
|
3827b1b243
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
sunyuchao
|
72c9cfd67f
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
226c182842
|
Merge branch 'dev_ic_mp' into develop
|
4 years ago |
|
sunyuchao
|
0aab5c5639
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev_ic_mp
|
4 years ago |
|
sunyuchao
|
11e6566b8a
|
......
|
4 years ago |
zxc
|
9e1a577e2b
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
5552a07eb0
|
Merge remote-tracking branch 'origin/dev_routine_work' into develop
|
4 years ago |
|
zxc
|
9edee12fa3
|
边框
|
4 years ago |
|
zxc
|
37b53708d7
|
Merge remote-tracking branch 'origin/release_temp' into release_temp
|
4 years ago |
|
jianjun
|
dc40ff5f2b
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into release_temp
|
4 years ago |
|
zxc
|
3779779bfc
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
jianjun
|
d0a62491e9
|
Merge branch 'develop' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
936b3042da
|
Merge branch 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
|
jianjun
|
f059a9ccf9
|
巡查显示小时分钟 没有为0
|
4 years ago |
|
zxc
|
5d2fbb2198
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
zxc
|
be0c5f97a3
|
预约时间段
|
4 years ago |
|
jianjun
|
5f4ff25660
|
Merge remote-tracking branch 'remotes/origin/develop' into release_temp
|
4 years ago |
|
jianjun
|
3c22942a42
|
Merge branch 'dev_routine_work' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop
|
4 years ago |
