sunyuchao
|
36a3caeb2d
|
Merge remote-tracking branch 'origin/dev_shibei_match' into dev_shibei_match
|
4 years ago |
|
sunyuchao
|
5085ee807d
|
Merge branch 'dev_bugfix_ljj' into dev_shibei_match
|
4 years ago |
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 |
yinzuomei
|
9e3c4944d1
|
Merge remote-tracking branch 'origin/master' into shibei_master
|
4 years ago |
|
zhaoqifeng
|
0fad17e961
|
计算两个日期之间的时间差(只包括工作日) 修改
|
4 years ago |
|
yinzuomei
|
2d21b4e8e7
|
服务名称up
|
4 years ago |
|
yinzuomei
|
57fdd1dc37
|
Merge remote-tracking branch 'origin/dev'
|
4 years ago |
|
yinzuomei
|
41b5936dfe
|
Merge remote-tracking branch 'origin/dev_ic_mp' into dev
|
4 years ago |
|
yinzuomei
|
d03f5f73a2
|
ic_user_demand_service添加server_name；指派和接单接口赋值
|
4 years ago |
|
yinzuomei
|
82c064db11
|
ic_user_demand_service添加server_name；指派和接单接口赋值
|
4 years ago |
zxc
|
bdc99114b7
|
groupAgencyDaily方法优化
|
4 years ago |
jianjun
|
e1f7879c21
|
Merge remote-tracking branch 'remotes/origin/dev_shibei_match' into shibei_master
|
4 years ago |
|
jianjun
|
376896c868
|
Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into dev_shibei_match
|
4 years ago |
|
zxc
|
320757ed8b
|
statsGroupGridDailyTask优化
|
4 years ago |
|
zhaoqifeng
|
3215e83a7f
|
项目列表bug修改
项目添加项目耗时字段
|
4 years ago |
|
jianjun
|
1f227d482e
|
例行工作次数导出 up
|
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 |
|
jianjun
|
fe3188c360
|
Merge branch 'dev_shibei_match' of http://git.elinkit.com.cn:7070/r/epmet-cloud into shibei_master
|
4 years ago |
|
jianjun
|
78896f9870
|
市北数字社区客户直接用他们的token
|
4 years ago |
|
jianjun
|
117b4999a3
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_shibei_match
|
4 years ago |
|
jianjun
|
afe9eea289
|
市北数字社区客户直接用他们的token
|
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 |
|
jianjun
|
dae73c9c1d
|
Merge remote-tracking branch 'origin/shibei_master' into shibei_master
|
4 years ago |
|
jianjun
|
0f622d4765
|
Merge branch 'dev_shibei_match' of http://git.elinkit.com.cn:7070/r/epmet-cloud into shibei_master
|
4 years ago |
|
jianjun
|
6cd21244d6
|
Merge remote-tracking branch 'remotes/origin/dev' into dev_shibei_match
|
4 years ago |
|
zxc
|
9eb3eb0d65
|
号码验证座机+手机
|
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 |
|
zxc
|
6702a1de2e
|
Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev
|
4 years ago |
