jianjun
|
18ecdfef4a
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
|
4 years ago |
|
jianjun
|
e16f28f121
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
848f82f3d6
|
验证码改为纯小写字母
|
4 years ago |
|
jianjun
|
94ec1cceb9
|
stats 去掉线程池定义 直接使用服务定义的线程池
|
4 years ago |
|
jianjun
|
5128a9202b
|
调整日志位置
|
4 years ago |
|
jianjun
|
c3cef2d4fb
|
修改日志级别
|
4 years ago |
wangxianzhang
|
ab25971c09
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
5acdfa9463
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
wangxianzhang
|
36f7f9471d
|
修改：
1.ResultDataResolver中的逻辑
|
4 years ago |
|
jianjun
|
1950214b1d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
jianjun
|
23872c9682
|
指标计算方法调用 挪到原始数据抽取完后计算
|
4 years ago |
zxc
|
69b3cf205c
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
3e770e9a15
|
排除报事
|
4 years ago |
sunyuchao
|
bfd990fb56
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
989e2ea826
|
新增工作人员对应的工作人员角色表的orgId永远都是组织Id
|
4 years ago |
|
jianjun
|
154d4ed0a8
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
e59852d086
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
162bbf97da
|
指标计算调整 暂未发现重复计算的问题
|
4 years ago |
|
sunyuchao
|
b044ba765d
|
Merge branch 'dev_bugfix_ljj' into dev
|
4 years ago |
|
sunyuchao
|
73ff7a02e6
|
议题转项目 分布式锁 代码优化
|
4 years ago |
|
sunyuchao
|
9b11791790
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
sunyuchao
|
781c3d93be
|
议题转项目加分布式锁
|
4 years ago |
|
jianjun
|
905c36e12c
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
|
4 years ago |
|
jianjun
|
9170c673b7
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
7f837051c4
|
项目变动 up
|
4 years ago |
zhaoqifeng
|
a6ca2de18f
|
项目结案时只更新项目状态与耗时
|
4 years ago |
|
jianjun
|
4d3788b3fa
|
Merge remote-tracking branch 'remotes/origin/dev' into 市北测试
|
4 years ago |
|
jianjun
|
5a07a84b05
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
9919509c6f
|
挪走了
|
4 years ago |
|
jianjun
|
2a53b397b2
|
Merge remote-tracking branch 'remotes/市北/prod' into master_for_shibei
|
4 years ago |
|
jianjun
|
1a0cd6e580
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into master_for_shibei
|
4 years ago |
|
jianjun
|
321a7bcb43
|
日志级别调整
|
4 years ago |
|
jianjun
|
aa0296495d
|
Merge branch 'master' of http://git.elinkit.com.cn:7070/r/ShibeiWorkPlatform; branch 'dev_shibei_match' of http://git.elinkit.com.cn:7070/r/epmet-cloud into master_for_shibei
|
4 years ago |
|
jianjun
|
142aae5e55
|
居民端登陆改造 阶段1.1
|
4 years ago |
|
jianjun
|
74d2aec3eb
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_match' into master_for_shibei
|
4 years ago |
|
jianjun
|
d176bc76b4
|
居民端登陆改造 阶段1
|
4 years ago |
|
jianjun
|
f96e874d43
|
配置pc客户菜单时 删除缓存 up
|
4 years ago |
|
jianjun
|
d029d4c185
|
Merge remote-tracking branch 'remotes/市北/master' into prod
|
4 years ago |
|
jianjun
|
5ccc1ae55c
|
Merge remote-tracking branch 'remotes/origin/dev' into master_for_shibei
|
4 years ago |
|
jianjun
|
ad710813cb
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
5d9828085c
|
配置pc客户菜单时 删除缓存
|
4 years ago |
|
jianjun
|
69dd134c53
|
导航菜单添加缓存 up
|
4 years ago |
|
jianjun
|
99650af09f
|
Merge remote-tracking branch 'remotes/市北/master' into prod
|
4 years ago |
|
jianjun
|
c3863f00f7
|
Merge remote-tracking branch 'remotes/origin/dev' into master_for_shibei
|
4 years ago |
|
jianjun
|
0953990bf2
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
jianjun
|
7589b5a6b2
|
导航菜单添加缓存
|
4 years ago |
|
jianjun
|
103ce2e56c
|
heart up
|
4 years ago |
|
jianjun
|
7a692da428
|
heart up
|
4 years ago |
|
jianjun
|
50a7123f99
|
Merge remote-tracking branch 'remotes/市北/master' into prod
|
4 years ago |
|
jianjun
|
758beb7b7a
|
Merge remote-tracking branch 'remotes/origin/dev' into master_for_shibei
|
4 years ago |
