186 Commits

Author SHA1 Message Date
尹吉欢 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
尹吉欢 1904cb16c2 add document 2018-02-28 10:23:04 +08:00
zongzhimin 1f8ac51a81 Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2 2018-02-28 10:11:39 +08:00
zongzhimin dd36120b30 fangjia-job 1.2 2018-02-28 10:11:32 +08:00
尹吉欢 3462b6f32d 小区详情实体类 2018-02-28 10:11:00 +08:00
虞继恩 17e2b562c6 Merge branch 'FSHJOB1.2' into 'master'
update

See merge request !10
2018-01-23 11:08:26 +08:00
尹吉欢 80ef043df1 update 2018-01-23 11:07:46 +08:00
虞继恩 cb7146fe62 Merge branch 'FSHJOB1.2' into 'master'
add

See merge request !9
2018-01-23 10:25:49 +08:00
尹吉欢 cb13683a4b add 2018-01-23 10:25:11 +08:00
虞继恩 850fce72f3 Merge branch 'FSHJOB1.2' into 'master'
Fshjob1.2

See merge request !8
2018-01-23 10:15:54 +08:00
尹吉欢 15e3a6fadf add 2018-01-19 16:20:47 +08:00
尹吉欢 b21f796a33 commit code youfang 2018-01-19 16:08:01 +08:00
虞继恩 6ed6b67c95 Merge branch 'FSHJOB1.2' into 'master'
去掉日志

See merge request !7
2017-12-15 12:02:55 +08:00
尹吉欢 1458d4fb88 去掉日志 2017-12-15 10:28:27 +08:00
虞继恩 a55799a63b Merge branch 'FSHJOB1.2' into 'master'
数据库连接池增加检测属性

See merge request !6
2017-12-03 11:08:37 +08:00
尹吉欢 b69513b9c6 数据库连接池增加检测属性 2017-12-03 11:07:24 +08:00
虞继恩 0ccb1f76b8 Merge branch 'FSHJOB1.2' into 'master'
Fshjob1.2

See merge request !5
2017-11-21 16:16:41 +08:00
gaojuan 003c4a396f bug 2017-11-17 17:38:08 +08:00
gaojuan 03929ed463 update bug 2017-11-16 17:26:04 +08:00
尹吉欢 f7381dfdba update 2017-11-16 17:17:29 +08:00
尹吉欢 c50b842b51 update 2017-11-16 10:10:53 +08:00
尹吉欢 888035cbaa 修改贷款客户分析参数类型 2017-11-15 16:40:34 +08:00
虞继恩 845a450d2b Merge branch 'FSHJOB1.2' into 'master'
Fshjob1.2

See merge request !4
2017-11-15 13:58:24 +08:00
尹吉欢 74f7d23ff3 Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2 2017-11-15 13:55:00 +08:00
尹吉欢 1d0467507e update config 2017-11-15 13:54:52 +08:00
虞继恩 03875ecb44 Merge branch 'FSHJOB1.2' into 'master'
Fshjob1.2

See merge request !3
2017-11-14 19:10:42 +08:00
尹吉欢 456da4053b add config 2017-11-14 19:09:52 +08:00
gaojuan 38b7b214ff Merge branch 'FSHJOB1.2' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2 2017-11-14 19:09:16 +08:00
gaojuan e4c65bce17 去null 2017-11-14 19:09:03 +08:00
尹吉欢 4daa2c2979 Merge branch 'master' of 192.168.0.27:dev0/fangjia-job into FSHJOB1.2 2017-11-14 19:05:51 +08:00