zhaoqifeng
|
9dd6f1d4fe
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
2515f1f618
|
Merge branch 'dev_bugfix_ljj' into develop
|
4 years ago |
|
zhaoqifeng
|
0fad17e961
|
计算两个日期之间的时间差(只包括工作日) 修改
|
4 years ago |
yinzuomei
|
41b5936dfe
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
e4e7842a5c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
13f246a52e
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
d03f5f73a2
|
ic_user_demand_service添加server_name；指派和接单接口赋值
|
4 years ago |
|
yinzuomei
|
25aedb953c
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
82c064db11
|
ic_user_demand_service添加server_name；指派和接单接口赋值
|
4 years ago |
zxc
|
bdc99114b7
|
groupAgencyDaily方法优化
|
4 years ago |
|
zxc
|
320757ed8b
|
statsGroupGridDailyTask优化
|
4 years ago |
|
zhaoqifeng
|
3215e83a7f
|
项目列表bug修改
项目添加项目耗时字段
|
4 years ago |
sunyuchao
|
fc9e104331
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
sunyuchao
|
fb74782364
|
Merge branch 'dev_bugfix_ljj' into develop
# Conflicts:
# epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java
|
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
|
275b1311bb
|
Merge branch 'develop' into release_temp
|
4 years ago |
|
zhaoqifeng
|
2811f99288
|
Merge branch 'dev_bugfix_ljj' into develop
# Conflicts:
# 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 |
|
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
|
2df910628e
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
d80127685a
|
Merge remote-tracking branch 'origin/dev_routine_work' into develop
|
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
|
c4a7042e6e
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
ad2f70c53d
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
0e7ac5a241
|
创建时间
|
4 years ago |
|
zxc
|
fcc624679c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
9926356fa7
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
03464fccbf
|
code
|
4 years ago |
|
zxc
|
69ddab7e4f
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
zxc
|
4aee55f1a7
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into develop
|
4 years ago |
|
zxc
|
9eb3eb0d65
|
号码验证座机+手机
|
4 years ago |
|
yinzuomei
|
d3b6d7824c
|
Merge remote-tracking branch 'origin/develop' into release_temp
|
4 years ago |
|
yinzuomei
|
a025d5e525
|
Merge remote-tracking branch 'origin/dev_ic_mp' into develop
|
4 years ago |
|
yinzuomei
|
ff33e88e88
|
updatecustomer先注释吧，不一定什么时候做
|
4 years ago |
|
yinzuomei
|
26502e0b51
|
运营端-修改客户信息1
|
4 years ago |
|
zxc
|
d931ae6890
|
heart导入微调升级
|
4 years ago |
|
zxc
|
b002072fdf
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
