04 Apr, 2018

2 commits

• 9ee7c30c   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/libs/processor.jar

  姚旭斌

  2018-04-04 09:52:49 +0800  
• fd014f0b   no message Browse File »
  张道锋

  2018-04-04 09:30:43 +0800  

30 Mar, 2018

2 commits

• 0b39881e   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/libs/processor.jar

  姚旭斌

  2018-03-30 14:57:04 +0800  
• ef29e61f   no message Browse File »
  张道锋

  2018-03-30 14:45:51 +0800  

29 Mar, 2018

1 commit

• 1612af77   no message Browse File »
  张道锋

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

27 Mar, 2018

1 commit

• d96a7aeb   no message Browse File »
  张道锋

  2018-03-27 16:50:11 +0800  

26 Mar, 2018

1 commit

• e18ab61a   no message Browse File »
  陶汉栋

  2018-03-26 17:52:42 +0800  

23 Mar, 2018

3 commits

• 8176e156   no message Browse File »
  陶汉栋

  2018-03-23 16:47:02 +0800  
• d106d2db   Merge branch 'developer' into yxb_dev ... Browse File »

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

  姚旭斌

  2018-03-23 16:19:57 +0800  
• abf181bd   no message Browse File »
  张道锋

  2018-03-23 16:01:44 +0800  

22 Mar, 2018

3 commits

• de5c40dd   Merge branch 'developer' into yxb_dev ... Browse File »

  # 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  
• f79e086c   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer Browse File »
  陶汉栋

  2018-03-22 11:39:34 +0800  
• e518b71b   no message Browse File »
  张道锋

  2018-03-22 10:53:19 +0800  

19 Mar, 2018

2 commits

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

  2018-03-19 18:31:25 +0800  
• 0e9edef2   no message Browse File »
  张道锋

  2018-03-19 18:04:37 +0800  

14 Mar, 2018

3 commits

• 26d3505e   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/java/com/shunzhi/parent/presenter/loginandregister/LoginAndRegisterPresenter.java

  姚旭斌

  2018-03-14 17:04:29 +0800  
• de62641e   no message Browse File »
  姚旭斌

  2018-03-14 17:02:44 +0800  
• 75be5d9a   no message Browse File »
  陶汉栋

  2018-03-14 16:49:37 +0800  

13 Mar, 2018

2 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  
• 1ca679e0   no message Browse File »
  陶汉栋

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

09 Mar, 2018

2 commits

• 217deceb   no message Browse File »
  陶汉栋

  2018-03-09 16:47:59 +0800  
• 1ff66eb6   no message Browse File »
  姚旭斌

  2018-03-09 15:31:10 +0800  

07 Mar, 2018

1 commit

• 23951db3   no message Browse File »
  陶汉栋

  2018-03-07 14:21:01 +0800  

06 Mar, 2018

1 commit

• d310981e   no message Browse File »
  姚旭斌

  2018-03-06 18:01:46 +0800  

05 Mar, 2018

1 commit

• 54127ffd   no message Browse File »
  陶汉栋

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