Commit Graph

  • 2e93831e8a Merge remote-tracking branch 'remotes/origin/master' into hechu1 hechu1 何楚 2019-01-17 09:32:39 +0800
  • 4144ed000d Merge remote-tracking branch 'remotes/origin/wlf' master zhai_lw 2019-01-16 22:35:36 +0800
  • 6d1ee2f0d1 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 16:49:18 +0800
  • 193a8ba91c Merge remote-tracking branch 'remotes/origin/wlf' zhai_lw 2019-01-16 16:36:14 +0800
  • dfe470d1a3 Merge remote-tracking branch 'remotes/origin/wlf' zhai_lw 2019-01-16 16:35:59 +0800
  • a19ca349b8 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 16:29:04 +0800
  • bc99b59f36 Merge remote-tracking branch 'remotes/origin/zgl' zhai_lw 2019-01-16 16:28:07 +0800
  • edbfb5aaba Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 16:26:50 +0800
  • 852256d95f Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 16:25:42 +0800
  • 0d4b7338bb Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 16:25:41 +0800
  • 9a178797e5 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 16:25:21 +0800
  • 215bc20326 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 16:18:47 +0800
  • 515442ea75 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 16:15:04 +0800
  • e9a34cee95 Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 16:15:04 +0800
  • e2102ef75a Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 15:43:52 +0800
  • 147864a878 Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 15:38:28 +0800
  • 05f3b310f5 process wmj wan 2019-01-16 15:34:12 +0800
  • 2678bcb567 Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 15:33:30 +0800
  • 60ab426c64 process wan 2019-01-16 15:19:21 +0800
  • 34c30c37d4 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 14:56:39 +0800
  • e3885d95e7 Merge remote-tracking branch 'remotes/origin/master' into zgl zgl zgl 2019-01-16 14:46:17 +0800
  • 5bde4d13ca Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 14:38:46 +0800
  • 55b9699b1c process wan 2019-01-16 14:37:47 +0800
  • 5b403d16b6 重构 zhai_lw 2019-01-16 12:53:42 +0800
  • a9e3908c6f Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-16 12:22:27 +0800
  • 139d16b702 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 12:20:52 +0800
  • 511e8cf0b2 GDMS init finished zhai_lw 2019-01-16 11:52:34 +0800
  • dfa880940e process wan 2019-01-16 11:34:50 +0800
  • d580b21f4c Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 11:03:36 +0800
  • db0eb6f49f Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 11:01:47 +0800
  • e4acad3a6d Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-16 11:01:20 +0800
  • a9c426ee6f Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 10:59:59 +0800
  • b20d8b00ca wan 2019-01-16 10:52:12 +0800
  • 738294004c wan 2019-01-16 10:51:51 +0800
  • 37682f9bc1 wan 2019-01-16 10:50:48 +0800
  • 20058dd88f Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-16 10:50:20 +0800
  • 255db387e1 Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-16 10:36:25 +0800
  • 049984695c Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 10:35:19 +0800
  • a1c83ce362 Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 10:34:23 +0800
  • db70f94ce2 Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 10:34:10 +0800
  • a39e20d3db Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-16 10:33:49 +0800
  • 574638756c Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 10:33:19 +0800
  • 1dfcd61fac 日期格式化 wan 2019-01-16 10:32:25 +0800
  • 4a41175a0d rewrite Process zhai_lw 2019-01-16 10:30:31 +0800
  • 5f1f583719 Merge remote-tracking branch 'remotes/origin/wmj' into zgl zgl 2019-01-16 10:01:12 +0800
  • c382405994 日期格式化 wan 2019-01-16 09:54:04 +0800
  • 057abc2477 增加process wan 2019-01-16 09:47:13 +0800
  • 0bbdd94575 增加process wan 2019-01-16 09:42:47 +0800
  • 113890c5f6 补充Service wan 2019-01-16 09:14:10 +0800
  • cfaef556d3 补充Service wan 2019-01-16 09:13:20 +0800
  • e744f97b8c Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-16 09:06:30 +0800
  • e2b0fcc128 rewrite Process zhai_lw 2019-01-16 08:58:05 +0800
  • e26d6cd914 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 23:56:19 +0800
  • 38b8f68d67 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 23:47:29 +0800
  • 2522730dad Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 23:18:39 +0800
  • 4a2ef0ab6d Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 23:18:19 +0800
  • 78666e3a41 rewrite Process zhai_lw 2019-01-15 23:16:23 +0800
  • 211b4b69ec Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 22:08:02 +0800
  • 8f2eb869a2 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 22:07:15 +0800
  • ed7bcee5b9 debug condition zhai_lw 2019-01-15 22:06:12 +0800
  • 3976d3677e Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-15 22:01:50 +0800
  • a010ba8f45 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 22:01:36 +0800
  • 49bcc9b319 debug condition zhai_lw 2019-01-15 22:01:23 +0800
  • 861f142ead Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 21:56:30 +0800
  • 2259cabba3 补充Service wan 2019-01-15 21:45:30 +0800
  • ce3b39c21d Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 21:43:13 +0800
  • c29dea0a04 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 20:26:25 +0800
  • ad7086f650 Merge remote-tracking branch 'remotes/origin/zgl' zhai_lw 2019-01-15 20:07:00 +0800
  • e9927b49f5 Merge remote-tracking branch 'remotes/origin/zgl' zhai_lw 2019-01-15 18:30:29 +0800
  • 7e3bad15ea Merge remote-tracking branch 'remotes/origin/wmj' zhai_lw 2019-01-15 18:29:33 +0800
  • 55a1d718f1 Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-15 18:27:28 +0800
  • ce9ae99567 Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-15 18:01:58 +0800
  • db1069d7c1 Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-15 18:00:01 +0800
  • 56771ceabd Merge branch 'master' of C:\Users\zhai_\Documents\GDMS with conflicts. zhai_lw 2019-01-15 17:46:28 +0800
  • 98b8eb8987 Merge remote-tracking branch 'remotes/origin/wmj' into zgl zgl 2019-01-15 17:44:24 +0800
  • ea7a6c6537 Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-15 17:44:21 +0800
  • 8af0c704a8 修改iconurl wan 2019-01-15 17:41:33 +0800
  • 6b6b333f46 完善process wan 2019-01-15 17:37:52 +0800
  • e69d6f0bce 完善process wan 2019-01-15 17:37:21 +0800
  • 0a4e6e35ed Merge remote-tracking branch 'remotes/origin/master' into zgl zgl 2019-01-15 17:34:28 +0800
  • a0c88902e5 Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-15 17:33:53 +0800
  • 0cdb2e654c Merge remote-tracking branch 'remotes/origin/master' into zgl zgl 2019-01-15 17:30:40 +0800
  • 00e57a490b Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-15 17:29:58 +0800
  • cf422038a2 Merge remote-tracking branch 'remotes/origin/zgl' into wmj wan 2019-01-15 16:48:24 +0800
  • 564dfcc57a Merge remote-tracking branch 'remotes/origin/wmj' into zgl zgl 2019-01-15 16:46:44 +0800
  • e291f3dfd1 Merge remote-tracking branch 'remotes/origin/wmj' into zgl zgl 2019-01-15 16:40:59 +0800
  • 36d73d4096 Merge remote-tracking branch 'remotes/origin/wmj' into zgl zgl 2019-01-15 16:40:15 +0800
  • 4fe5018fe4 增加iconurl wan 2019-01-15 16:33:10 +0800
  • adbb0795d8 增加iconurl wan 2019-01-15 16:32:25 +0800
  • 30a6762f7d 增加iconurl wan 2019-01-15 16:31:07 +0800
  • 9433c8ad1a Merge remote-tracking branches 'remotes/origin/wmj' and 'remotes/origin/zgl' zhai_lw 2019-01-15 16:20:37 +0800
  • 667a057e11 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 16:19:06 +0800
  • 6aee5b693a Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-15 16:11:33 +0800
  • 1b127f1c80 process命名 wan 2019-01-15 16:10:52 +0800
  • 1473462317 Merge remote-tracking branch 'remotes/origin/hechu1' zhai_lw 2019-01-15 16:04:53 +0800
  • d82601a028 Merge remote-tracking branch 'remotes/origin/master' into zgl zgl 2019-01-15 15:43:39 +0800
  • 721076b14b Merge remote-tracking branch 'remotes/origin/master' into zgl zgl 2019-01-15 15:42:13 +0800
  • 4d391f941d Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 15:41:05 +0800
  • 1e7eb32f85 Merge remote-tracking branch 'remotes/origin/master' into hechu1 何楚 2019-01-15 15:40:39 +0800
  • 6b317d369e Merge remote-tracking branch 'remotes/origin/master' into zgl zgl 2019-01-15 15:37:14 +0800