陶汉栋 / ParentWork

05 May, 2018

2 commits

e3782ee9 no message Browse Dir »

陶汉栋
2018-05-05 08:04:50 +0800
f62d7dcc no message Browse Dir »

陶汉栋
2018-05-05 08:03:28 +0800

04 May, 2018

1 commit

20641deb no message Browse Dir »

姚旭斌
2018-05-04 18:54:17 +0800

28 Apr, 2018

2 commits

d25fb468 no message Browse Dir »

陶汉栋
2018-04-28 20:01:25 +0800
9ffdddb3 Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse Dir »

陶汉栋
2018-04-28 18:47:52 +0800

25 Apr, 2018

1 commit

e04ba2c4 no message Browse Dir »

姚旭斌
2018-04-25 17:20:50 +0800

24 Apr, 2018

2 commits

1c1190fa no message Browse Dir »

姚旭斌
2018-04-24 15:15:45 +0800
22bcc3a8 no message Browse Dir »

陶汉栋
2018-04-24 08:18:29 +0800

22 Apr, 2018

1 commit

1ec4334b no message Browse Dir »

陶汉栋
2018-04-22 12:58:28 +0800

21 Apr, 2018

1 commit

fc0ad32a no message Browse Dir »

姚旭斌
2018-04-21 18:36:11 +0800

20 Apr, 2018

5 commits

6edf5ac2 no message Browse Dir »

陶汉栋
2018-04-20 22:08:55 +0800
1eaf1abb no message Browse Dir »

姚旭斌
2018-04-20 12:56:18 +0800
e28a131f Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into wwx ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
#	app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplySigninFragment.java
```
wwx
2018-04-20 12:22:10 +0800
45b64f1c no message Browse Dir »

姚旭斌
2018-04-20 11:27:41 +0800
105e0366 no message Browse Dir »

姚旭斌
2018-04-20 00:49:48 +0800

19 Apr, 2018

10 commits

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

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

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

wwx
2018-04-19 17:57:13 +0800

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

# Conflicts:
#	app/src/main/java/com/shunzhi/parent/AppConfig.java
#	app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java
#	app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java

2018-04-19 16:30:24 +0800

d45ad6c3 Merge branch 'wwx' into yxb_dev ... Browse Dir »

# Conflicts:
#	app/libs/processor.jar
#	app/src/main/java/com/shunzhi/parent/AppConfig.java
#	app/src/main/java/com/shunzhi/parent/api/ApplyReplaceCardApi.java
#	app/src/main/java/com/shunzhi/parent/model/apply/ApplyReplaceCardModel.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/apply/ApplyReplaceCardFragment.java

2018-04-19 16:28:51 +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
edbb9eeb no message Browse Dir »

姚旭斌
2018-04-19 16:26:41 +0800
8e9c580c no message Browse Dir »

wwx
2018-04-19 16:25:43 +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