陶汉栋 / ParentWork

24 Apr, 2018

1 commit

22bcc3a8 no message Browse Dir »

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

22 Apr, 2018

1 commit

f96e1956 no message Browse Dir »

陶汉栋
2018-04-22 12:06:48 +0800

20 Apr, 2018

9 commits

6edf5ac2 no message Browse Dir »

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

姚旭斌
2018-04-20 18:12:59 +0800
65f35ef4 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
```
姚旭斌
2018-04-20 13:44:35 +0800
6cc68c13 no message Browse Dir »

陶汉栋
2018-04-20 13:40:39 +0800
73e6410c no message Browse Dir »

wwx
2018-04-20 13:18:23 +0800
d246c3a5 Merge branch 'wwx' into yxb_dev Browse Dir »

姚旭斌
2018-04-20 12:56:35 +0800
45b64f1c no message Browse Dir »

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

wwx
2018-04-20 11:20:51 +0800
105e0366 no message Browse Dir »

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

19 Apr, 2018

3 commits

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

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

wwx
2018-04-19 16:25:43 +0800
d958596a no message Browse Dir »

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

18 Apr, 2018

3 commits

55f0d839 no message Browse Dir »

wwx
2018-04-18 18:07:38 +0800
774a0595 no message Browse Dir »

wwx
2018-04-18 14:28:19 +0800
f3a94eee no message Browse Dir »

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

14 Apr, 2018

1 commit

ea6ec964 no message Browse Dir »

陶汉栋
2018-04-14 08:08:10 +0800

12 Apr, 2018

1 commit

4d51724e no message Browse Dir »

姚旭斌
2018-04-12 11:33:51 +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

17585259 no message Browse Dir »

姚旭斌
2018-04-10 23:55:51 +0800
fd11b76f Merge branch 'developer' into yxb_dev Browse Dir »

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

陶汉栋
2018-04-10 11:00:16 +0800

08 Apr, 2018

1 commit

08b7799e no message Browse Dir »

姚旭斌
2018-04-08 19:23:34 +0800

04 Apr, 2018

6 commits

a299f710 Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	.idea/modules.xml
#	app/libs/processor.jar
```
姚旭斌
2018-04-04 21:43:39 +0800
9bb016c5 no message Browse Dir »

陶汉栋
2018-04-04 18:48:15 +0800
afec02d6 no message Browse Dir »

姚旭斌
2018-04-04 15:19:23 +0800
9ee7c30c Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
```
姚旭斌
2018-04-04 09:52:49 +0800
24a5ea4a no message Browse Dir »

姚旭斌
2018-04-04 09:47:58 +0800
fd014f0b no message Browse Dir »

张道锋
2018-04-04 09:30:43 +0800

02 Apr, 2018

2 commits

61f40825 no message Browse Dir »

陶汉栋
2018-04-02 14:32:25 +0800
b6054d7e Merge branch 'developer' into yxb_dev Browse Dir »

姚旭斌
2018-04-02 09:42:17 +0800

31 Mar, 2018

1 commit

ba2f7301 no message Browse Dir »

张道锋
2018-03-31 18:02:17 +0800

30 Mar, 2018

4 commits

0b39881e Merge branch 'developer' into yxb_dev ... Browse Dir »
```
# Conflicts:
#	app/libs/processor.jar
```
姚旭斌
2018-03-30 14:57:04 +0800
cb057a09 no message Browse Dir »

姚旭斌
2018-03-30 14:56:23 +0800
ef29e61f no message Browse Dir »

张道锋
2018-03-30 14:45:51 +0800
42f883a1 no message Browse Dir »

张道锋
2018-03-30 10:40:49 +0800

29 Mar, 2018

1 commit

1612af77 no message Browse Dir »

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

19 Mar, 2018

1 commit

e09ea034 Merge branch 'developer' into yxb_dev ... Browse Dir »

# Conflicts:
#	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java
#	app/src/main/java/com/shunzhi/parent/ui/activity/mywebview/WebViewActivity.java
#	app/src/main/java/com/shunzhi/parent/ui/fragment/consult/ConsultOneLevelFragment.java
#	app/src/main/res/layout/activity_web_view.xml

2018-03-19 14:22:43 +0800