zhaoqifeng
|
2e85c54acf
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj
|
4 years ago |
|
zhaoqifeng
|
6396bd646b
|
备注
|
4 years ago |
sunyuchao
|
763edcd766
|
项目机关日统计程序优化
|
4 years ago |
|
zhaoqifeng
|
0fad17e961
|
计算两个日期之间的时间差(只包括工作日) 修改
|
4 years ago |
zxc
|
bdc99114b7
|
groupAgencyDaily方法优化
|
4 years ago |
|
zxc
|
320757ed8b
|
statsGroupGridDailyTask优化
|
4 years ago |
|
zhaoqifeng
|
3215e83a7f
|
项目列表bug修改
项目添加项目耗时字段
|
4 years ago |
|
sunyuchao
|
15216eccf6
|
机关项目日统计程序调整优化
|
4 years ago |
|
sunyuchao
|
3943cf716e
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix_ljj
Conflicts:
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java
epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
|
4 years ago |
jianjun
|
79516f3c1d
|
例行工作次数导出
|
4 years ago |
|
sunyuchao
|
409c43269f
|
机关项目日统计程序调整优化
|
4 years ago |
wangxianzhang
|
7fb8931d59
|
版本升级
|
4 years ago |
|
wangxianzhang
|
88a40db14f
|
Merge branch 'dev'
|
4 years ago |
|
wangxianzhang
|
e38414ea73
|
Merge branch 'wxz_blockchain' into dev
|
4 years ago |
|
zhaoqifeng
|
e30be3252a
|
项目列表bug修改
项目添加项目耗时字段
|
4 years ago |
|
zhaoqifeng
|
f2b2c08334
|
项目列表bug修改
项目添加项目耗时字段
|
4 years ago |
|
zxc
|
62e2d911bd
|
org，user升级
|
4 years ago |
|
zxc
|
e063164717
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
cd7e7c7f3c
|
Merge remote-tracking branch 'origin/dev_routine_work' into dev
|
4 years ago |
|
zxc
|
3c605a9082
|
查询网格名
|
4 years ago |
|
zxc
|
0a6d2ddefd
|
查询网格名
|
4 years ago |
|
jianjun
|
eff7e69530
|
例行工作数字 up
|
4 years ago |
|
jianjun
|
caa2c94586
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
258b191140
|
例行工作数字
|
4 years ago |
|
zxc
|
0e7ac5a241
|
创建时间
|
4 years ago |
|
zxc
|
03464fccbf
|
code
|
4 years ago |
|
zxc
|
9eb3eb0d65
|
号码验证座机+手机
|
4 years ago |
|
zxc
|
d931ae6890
|
heart导入微调升级
|
4 years ago |
|
zxc
|
b002072fdf
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
zxc
|
6702a1de2e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
|
zxc
|
688dd89a2b
|
社区自组织导出
|
4 years ago |
|
jianjun
|
7bff461408
|
去掉线程 up
|
4 years ago |
|
jianjun
|
6e260ddd21
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
c78b85f332
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
ef54b6f87a
|
去掉线程
|
4 years ago |
|
jianjun
|
9494bff2ee
|
难点堵点 只差查近10天的结案数据和未结案的所有数据 up
|
4 years ago |
|
jianjun
|
1b1bd40dc4
|
Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud
|
4 years ago |
|
jianjun
|
e9a6bb74d7
|
Merge branch 'dev_bugfix_ljj' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev
|
4 years ago |
|
jianjun
|
78c493239c
|
难点堵点 只差查近10天的结案数据和未结案的所有数据
|
4 years ago |
|
jianjun
|
8b3c365abc
|
难点堵点1000
|
4 years ago |
|
jianjun
|
4f03394c72
|
难点堵点 优化步骤1 up
|
4 years ago |
|
jianjun
|
16d6a4b75c
|
Merge remote-tracking branch 'remotes/origin/dev'
|
4 years ago |
|
jianjun
|
44dde15bbf
|
Merge remote-tracking branch 'origin/dev' into dev
|
4 years ago |
|
jianjun
|
2443d35ab4
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev
# Conflicts:
# epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenDifficultyDataServiceImpl.java
|
4 years ago |
|
jianjun
|
6595f51a22
|
难点堵点 优化步骤1
|
4 years ago |
|
sunyuchao
|
73b158b2e1
|
again
|
4 years ago |
|
sunyuchao
|
239e5e735a
|
Merge branch 'dev'
|
4 years ago |
|
sunyuchao
|
492a6a06b2
|
.
|
4 years ago |
|
sunyuchao
|
726b5a45e2
|
bug修改
|
4 years ago |
yinzuomei
|
05e68a7a5b
|
/gov/org/agency/agencydetail up
|
4 years ago |
