虞继恩
|
8a0bee3739
|
Merge branch 'FSHJOB1.2' into 'master'
资产排名
See merge request !23
|
2018-05-16 13:21:07 +08:00 |
|
尹吉欢
|
6e8c60519b
|
资产排名
|
2018-05-14 14:57:49 +08:00 |
|
虞继恩
|
2df7156ac6
|
Merge branch 'FSHJOB1.2' into 'master'
非注册用户统计脚本修改
See merge request !22
|
2018-05-10 15:43:02 +08:00 |
|
尹吉欢
|
c0d07c1533
|
非注册用户统计脚本修改
|
2018-05-10 15:01:44 +08:00 |
|
虞继恩
|
a406e482a0
|
Merge branch 'FSHJOB1.2' into 'master'
fix bug
See merge request !21
|
2018-05-10 13:13:00 +08:00 |
|
尹吉欢
|
e6d901c743
|
fix bug
|
2018-05-10 13:12:40 +08:00 |
|
虞继恩
|
895635763e
|
Merge branch 'FSHJOB1.2' into 'master'
Fshjob1.2
See merge request !20
|
2018-05-09 10:06:57 +08:00 |
|
尹吉欢
|
b31b65c50a
|
修改小区详情汇总任务时间
|
2018-05-09 10:06:27 +08:00 |
|
尹吉欢
|
ce717e78ab
|
Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2
|
2018-05-04 13:37:11 +08:00 |
|
尹吉欢
|
f8f7ca3eb8
|
统计非注册用户信息任务
|
2018-05-04 13:37:00 +08:00 |
|
gaojuan
|
2f4236dd93
|
Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2
Conflicts:
fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/DistrictDetail.java
fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/DistrictInfoJob.java
|
2018-04-23 18:02:44 +08:00 |
|
gaojuan
|
ed982e8124
|
update
|
2018-04-23 17:00:42 +08:00 |
|
虞继恩
|
8949c9ee1e
|
Merge branch 'FSHJOB1.2' into 'master'
update
See merge request !19
|
2018-04-19 19:49:46 +08:00 |
|
尹吉欢
|
d3b5873ab6
|
update
|
2018-04-19 19:49:00 +08:00 |
|
虞继恩
|
4743db9ec1
|
Merge branch 'FSHJOB1.2' into 'master'
Fshjob1.2
See merge request !18
|
2018-04-17 17:00:46 +08:00 |
|
尹吉欢
|
fe33ce855b
|
修改集合名称,临时用
|
2018-04-17 16:57:33 +08:00 |
|
尹吉欢
|
1b2dc88c5b
|
job update
|
2018-04-14 09:33:29 +08:00 |
|
尹吉欢
|
fea6d09d04
|
Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2
Conflicts:
fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/document/DistrictDetail.java
|
2018-04-09 18:36:02 +08:00 |
|
尹吉欢
|
44d3feda40
|
add
|
2018-04-09 18:34:40 +08:00 |
|
gaojuan
|
d5ed649437
|
添加小区所在城市排名
|
2018-04-09 09:55:31 +08:00 |
|
尹吉欢
|
a2e06e2ece
|
小区汇总数据接口修改
|
2018-03-28 17:08:57 +08:00 |
|
虞继恩
|
a94eaae4f1
|
Merge branch 'FSHJOB1.2' into 'master'
Fshjob1.2
See merge request !17
|
2018-03-15 18:20:48 +08:00 |
|
尹吉欢
|
9b4daec568
|
脚本修改
|
2018-03-15 18:20:09 +08:00 |
|
尹吉欢
|
1420f3e73c
|
新闻定时发布脚本
|
2018-03-12 13:38:09 +08:00 |
|
虞继恩
|
bacfc35f88
|
Merge branch 'FSHJOB1.2' into 'master'
update mongo connecttimeout
See merge request !16
|
2018-03-11 19:37:52 +08:00 |
|
尹吉欢
|
814ed6833b
|
update mongo connecttimeout
|
2018-03-11 19:36:49 +08:00 |
|
虞继恩
|
c3cf17f4c3
|
Merge branch 'FSHJOB1.2' into 'master'
房生活用户统计任务优化
See merge request !15
|
2018-03-06 15:52:43 +08:00 |
|
尹吉欢
|
beca90e9d7
|
房生活用户统计任务优化
|
2018-03-06 15:50:19 +08:00 |
|
虞继恩
|
0f26ca3a69
|
Merge branch 'FSHJOB1.2' into 'master'
add
See merge request !14
|
2018-03-02 13:39:42 +08:00 |
|
尹吉欢
|
704cd6cd45
|
add
|
2018-03-02 13:39:18 +08:00 |
|
虞继恩
|
9fef3158dc
|
Merge branch 'FSHJOB1.2' into 'master'
add code
See merge request !13
|
2018-03-02 13:38:01 +08:00 |
|
尹吉欢
|
42c4a28a66
|
add code
|
2018-03-02 13:37:36 +08:00 |
|
虞继恩
|
98052bfb4e
|
Merge branch 'FSHJOB1.2' into 'master'
update thread pool size
See merge request !12
|
2018-03-02 11:47:54 +08:00 |
|
尹吉欢
|
43f7e9d3f1
|
update thread pool size
|
2018-03-02 11:47:31 +08:00 |
|
虞继恩
|
0e157e49e4
|
Merge branch 'FSHJOB1.2' into 'master'
Fshjob1.2
See merge request !11
|
2018-03-02 11:36:58 +08:00 |
|
尹吉欢
|
6e513ef35e
|
add
|
2018-03-02 11:36:13 +08:00 |
|
尹吉欢
|
25385692bb
|
add refresh job
|
2018-03-02 11:31:48 +08:00 |
|
尹吉欢
|
ec565e64be
|
小区汇总信息任务修改
|
2018-03-02 11:05:08 +08:00 |
|
尹吉欢
|
35acacc71d
|
任务时间修改
|
2018-03-01 15:26:22 +08:00 |
|
zongzhimin
|
1415ac4bbd
|
fangjia-job 1.2
|
2018-02-28 17:30:25 +08:00 |
|
zongzhimin
|
78a5bfde5a
|
Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2
|
2018-02-28 17:06:55 +08:00 |
|
zongzhimin
|
2735e27744
|
fangjia-job 1.2
|
2018-02-28 17:06:50 +08:00 |
|
尹吉欢
|
aad106ca20
|
Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2
|
2018-02-28 17:06:05 +08:00 |
|
尹吉欢
|
28178e688d
|
增加小区库的数据库链接配置
|
2018-02-28 17:05:55 +08:00 |
|
zongzhimin
|
0464139ca2
|
Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2
# Conflicts:
# fangjia-job/fangjia-job-youfang/src/main/java/com/fangjia/job/youfang/job/DistrictInfoJob.java
|
2018-02-28 10:48:48 +08:00 |
|
zongzhimin
|
0f2a131340
|
fangjia-job 1.2
|
2018-02-28 10:47:43 +08:00 |
|
尹吉欢
|
66d34f7f3b
|
Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2
|
2018-02-28 10:47:26 +08:00 |
|
尹吉欢
|
cb1f3833a5
|
add
|
2018-02-28 10:47:18 +08:00 |
|
zongzhimin
|
ab8455e2be
|
Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2
|
2018-02-28 10:23:31 +08:00 |
|
zongzhimin
|
ef1e30c964
|
fangjia-job 1.2
|
2018-02-28 10:23:25 +08:00 |
|