陶汉栋 / ParentWork

18 Mar, 2018

1 commit

8c6d07ed no message Browse Code »

姚旭斌
2018-03-18 23:52:58 +0800

17 Mar, 2018

4 commits

26d17696 no message Browse Code »

姚旭斌
2018-03-17 17:27:50 +0800
de0d72ae no message Browse Code »

姚旭斌
2018-03-17 10:35:56 +0800

c9426721 Merge branch 'developer' into yxb_dev ... Browse Code »

# Conflicts:
#	app/src/main/java/com/shunzhi/parent/AppConfig.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java

2018-03-17 10:34:37 +0800

f307b0dd no message Browse Code »

姚旭斌
2018-03-17 10:33:19 +0800

16 Mar, 2018

20 commits

dec4c9a0 no message Browse Code »

姚旭斌
2018-03-16 23:04:48 +0800
0a469ad2 no message Browse Code »

陶汉栋
2018-03-16 19:12:57 +0800
6bee8968 no message Browse Code »

姚旭斌
2018-03-16 18:32:29 +0800
2e8868cb no message Browse Code »

陶汉栋
2018-03-16 18:00:03 +0800
658234ab Merge branch 'developer' into yxb_dev Browse Code »

姚旭斌
2018-03-16 17:57:11 +0800
8510cba8 no message Browse Code »

陶汉栋
2018-03-16 17:55:36 +0800
8f6486da Merge branch 'developer' into yxb_dev ... Browse Code »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/activity/web/WebViewActivity.java
```
姚旭斌
2018-03-16 17:49:37 +0800
b9b5e32e Merge branch 'developer' into yxb_dev ... Browse Code »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java
```
姚旭斌
2018-03-16 17:47:29 +0800
f7a6aa86 no message Browse Code »

陶汉栋
2018-03-16 17:34:00 +0800
bfc68ef2 no message Browse Code »

陶汉栋
2018-03-16 17:28:06 +0800

ad89d180 Merge branch 'developer' into yxb_dev ... Browse Code »

# Conflicts:
#	app/src/main/java/com/shunzhi/parent/AppConfig.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/loginandregistfragment/LoginAndRegistFragment.java

2018-03-16 17:17:57 +0800

2c3dd885 no message Browse Code »

姚旭斌
2018-03-16 17:16:05 +0800
b181dda4 no message Browse Code »

陶汉栋
2018-03-16 13:45:20 +0800
a97b79d9 no message Browse Code »

姚旭斌
2018-03-16 13:42:44 +0800
7143f4b6 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »

陶汉栋
2018-03-16 13:29:33 +0800
378663ec no message Browse Code »

陶汉栋
2018-03-16 13:29:22 +0800
bcb57ba9 Merge branch 'developer' into yxb_dev Browse Code »

姚旭斌
2018-03-16 09:07:41 +0800
b21e283f no message Browse Code »

姚旭斌
2018-03-16 09:07:19 +0800
6a57d64f Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »

陶汉栋
2018-03-16 08:24:15 +0800
b808b918 no message Browse Code »

陶汉栋
2018-03-16 08:24:03 +0800

15 Mar, 2018

15 commits

08e1bf53 no message Browse Code »

陶汉栋
2018-03-15 17:57:59 +0800
c7225026 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Code »

姚旭斌
2018-03-15 17:35:29 +0800
616118e8 no message Browse Code »

姚旭斌
2018-03-15 17:35:23 +0800
07328347 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »

陶汉栋
2018-03-15 17:32:04 +0800
d4dc8b01 no message Browse Code »

陶汉栋
2018-03-15 17:31:27 +0800
675bd555 no message Browse Code »

陶汉栋
2018-03-15 17:24:56 +0800
c0b46499 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Code »

姚旭斌
2018-03-15 17:02:42 +0800
df6597cd no message Browse Code »

姚旭斌
2018-03-15 17:02:38 +0800
ecc56fa8 no message Browse Code »

陶汉栋
2018-03-15 11:50:32 +0800
84aba0cd Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Code »

陶汉栋
2018-03-15 09:52:01 +0800
287f1d90 no message Browse Code »

陶汉栋
2018-03-15 09:51:47 +0800
02c439f8 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Code »

姚旭斌
2018-03-15 09:50:52 +0800
b3c43071 no message Browse Code »

姚旭斌
2018-03-15 09:50:47 +0800
9d07eb7d no message Browse Code »

陶汉栋
2018-03-15 08:59:54 +0800
f552dcac no message Browse Code »

陶汉栋
2018-03-15 08:39:56 +0800