18 Apr, 2018

2 commits

• 774a0595   no message Browse File »
  wwx

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

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

14 Apr, 2018

1 commit

• eda704de   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-04-14 08:13:41 +0800  

13 Apr, 2018

1 commit

• e9804745   no message Browse File »
  姚旭斌

  2018-04-13 19:21:57 +0800  

11 Apr, 2018

2 commits

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

  2018-04-11 14:24:57 +0800  
• 41f159b5   Merge branch 'developer' into wwx Browse File »
  段合江

  2018-04-11 09:15:38 +0800  

10 Apr, 2018

3 commits

• fd11b76f   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-04-10 19:38:31 +0800  
• 0cbb0554   no message Browse File »
  陶汉栋

  2018-04-10 17:24:33 +0800  
• 7cd6b667   no message Browse File »
  陶汉栋

  2018-04-10 11:00:16 +0800  

29 Mar, 2018

1 commit

• 762b1b1d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  张道锋

  2018-03-29 18:09:40 +0800  

28 Mar, 2018

2 commits

• 0cbfbb68   no message Browse File »
  陶汉栋

  2018-03-28 19:37:03 +0800  
• 62be613c   no message Browse File »
  姚旭斌

  2018-03-28 19:35:03 +0800  

26 Mar, 2018

1 commit

• 8c9c3f09   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  张道锋

  2018-03-26 10:08:18 +0800  

24 Mar, 2018

2 commits

• 3305740f   no message Browse File »
  陶汉栋

  2018-03-24 10:26:30 +0800  
• 8d78127a   no message Browse File »
  姚旭斌

  2018-03-24 09:43:02 +0800  

23 Mar, 2018

3 commits

• c5aac4c3   no message Browse File »
  陶汉栋

  2018-03-23 16:06:22 +0800  
• ec9c6c5d   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml

  张道锋

  2018-03-23 16:03:39 +0800  
• 4065e67b   no message Browse File »
  姚旭斌

  2018-03-23 15:37:40 +0800  

22 Mar, 2018

3 commits

• ae9a2c2f   no message Browse File »
  陶汉栋

  2018-03-22 16:51:54 +0800  
• 2a83582a   no message Browse File »
  姚旭斌

  2018-03-22 11:37:04 +0800  
• 50ca3597   no message Browse File »
  张道锋

  2018-03-22 11:06:39 +0800  

21 Mar, 2018

2 commits

• fbd004dd   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-21 16:41:47 +0800  
• ec30fab4   no message Browse File »
  陶汉栋

  2018-03-21 15:43:34 +0800  

20 Mar, 2018

2 commits

• 69e40270   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-20 11:32:10 +0800  
• 6b5379b8   no message Browse File »
  陶汉栋

  2018-03-20 10:30:59 +0800  

15 Mar, 2018

4 commits

• c7225026   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse File »
  姚旭斌

  2018-03-15 17:35:29 +0800  
• 675bd555   no message Browse File »
  陶汉栋

  2018-03-15 17:24:56 +0800  
• c0b46499   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse File »
  姚旭斌

  2018-03-15 17:02:42 +0800  
• ecc56fa8   no message Browse File »
  陶汉栋

  2018-03-15 11:50:32 +0800  

13 Mar, 2018

4 commits

• 87ab95b8   Merge branch 'developer' into yxb_dev ... Browse File »

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

  姚旭斌

  2018-03-13 11:19:58 +0800  
• 5ecc3e8e   no message Browse File »
  陶汉栋

  2018-03-13 09:12:25 +0800  
• 067374b8   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml
  #	app/src/main/java/com/shunzhi/parent/ui/fragment/ReportFragment.java
  #	app/src/main/res/layout/fragment_report.xml
  #	mvpsdk/src/main/java/com/share/mvpsdk/base/activity/BaseCompatActivity.java
  #	mvpsdk/src/main/java/com/share/mvpsdk/utils/OkHttpExceptionUtil.java

  陶汉栋

  2018-03-13 08:18:50 +0800  
• 1ca679e0   no message Browse File »
  陶汉栋

  2018-03-13 08:08:35 +0800  

12 Mar, 2018

1 commit

• bcafe53a   no message Browse File »
  姚旭斌

  2018-03-12 11:06:16 +0800  

10 Mar, 2018

1 commit

• 42f6a92a   no message Browse File »
  姚旭斌

  2018-03-10 14:40:47 +0800  

05 Mar, 2018

1 commit

• 54127ffd   no message Browse File »
  陶汉栋

  2018-03-05 17:33:43 +0800