陶汉栋 / ParentWork

19 Apr, 2018

5 commits

426dfc9c Merge branch 'wwx' into yxb_dev Browse Dir »

姚旭斌
2018-04-19 19:17:43 +0800
b51bca00 no message Browse Dir »

wwx
2018-04-19 17:57:13 +0800
16962567 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
```
wwx
2018-04-19 16:27:48 +0800
772a6e0a Merge branch 'wwx' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
```
姚旭斌
2018-04-19 13:14:57 +0800
d958596a no message Browse Dir »

姚旭斌
2018-04-19 13:14:23 +0800

18 Apr, 2018

1 commit

f3a94eee no message Browse Dir »

wwx
2018-04-18 09:19:45 +0800

16 Apr, 2018

2 commits

5d685fa7 no message Browse Dir »

wwx
2018-04-16 18:26:28 +0800
c2e55796 no message Browse Dir »

wwx
2018-04-16 18:24:53 +0800

14 Apr, 2018

1 commit

eda704de Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-04-14 08:13:41 +0800

13 Apr, 2018

1 commit

e9804745 no message Browse Dir »

姚旭斌
2018-04-13 19:21:57 +0800

11 Apr, 2018

2 commits

d7b686ff 1：成长界面中应用中补卡和考勤界面搭建 Browse Dir »

wwx
2018-04-11 14:24:57 +0800
41f159b5 Merge branch 'developer' into wwx Browse Dir »

段合江
2018-04-11 09:15:38 +0800

10 Apr, 2018

3 commits

fd11b76f Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-04-10 19:38:31 +0800
0cbb0554 no message Browse Dir »

陶汉栋
2018-04-10 17:24:33 +0800
a0178454 no message Browse Dir »

陶汉栋
2018-04-10 11:02:25 +0800

04 Apr, 2018

1 commit

566a8c8f no message Browse Dir »

姚旭斌
2018-04-04 13:53:31 +0800

29 Mar, 2018

1 commit

762b1b1d Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

张道锋
2018-03-29 18:09:40 +0800

28 Mar, 2018

2 commits

0cbfbb68 no message Browse Dir »

陶汉栋
2018-03-28 19:37:03 +0800
62be613c no message Browse Dir »

姚旭斌
2018-03-28 19:35:03 +0800

27 Mar, 2018

2 commits

4f854ee0 no message Browse Dir »

张道锋
2018-03-27 16:54:18 +0800
92beb983 no message Browse Dir »

陶汉栋
2018-03-27 10:59:29 +0800

23 Mar, 2018

1 commit

ec9c6c5d Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
张道锋
2018-03-23 16:03:39 +0800

22 Mar, 2018

5 commits

57dfbdb6 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-22 15:53:45 +0800
432b4257 no message Browse Dir »

陶汉栋
2018-03-22 15:36:10 +0800
de5c40dd Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/fragment/MineFragment.java
#	app/src/main/res/layout/fragment_mine.xml
```
姚旭斌
2018-03-22 12:30:21 +0800
49d6fe65 no message Browse Dir »

陶汉栋
2018-03-22 11:39:15 +0800
50ca3597 no message Browse Dir »

张道锋
2018-03-22 11:06:39 +0800

21 Mar, 2018

2 commits

d045d156 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-21 15:26:55 +0800
8c263840 no message Browse Dir »

陶汉栋
2018-03-21 14:42:38 +0800

20 Mar, 2018

2 commits

69e40270 Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-03-20 11:32:10 +0800
0d40485b no message Browse Dir »

陶汉栋
2018-03-20 10:49:16 +0800

17 Mar, 2018

1 commit

c84d485d Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse Dir »
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
张道锋
2018-03-17 17:34:49 +0800

16 Mar, 2018

4 commits

b9b5e32e Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/src/main/java/com/shunzhi/parent/ui/activity/WebViewActivity.java
```
姚旭斌
2018-03-16 17:47:29 +0800
bfc68ef2 no message Browse Dir »

陶汉栋
2018-03-16 17:28:06 +0800
bcb57ba9 Merge branch 'developer' into yxb_dev Browse Dir »

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

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

15 Mar, 2018

3 commits

c7225026 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse Dir »

姚旭斌
2018-03-15 17:35:29 +0800
675bd555 no message Browse Dir »

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

陶汉栋
2018-03-15 08:20:51 +0800

14 Mar, 2018

1 commit

de62641e no message Browse Dir »

姚旭斌
2018-03-14 17:02:44 +0800