04 Apr, 2018

1 commit

• 9bb016c5   no message Browse File »
  陶汉栋

  2018-04-04 18:48:15 +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

7 commits

• 5a577c2a   Merge branch 'developer' into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/AndroidManifest.xml
  #	app/src/main/res/layout/activity_personinfo.xml
  #	app/src/main/res/layout/fragment_mine.xml

  姚旭斌

  2018-03-24 17:42:54 +0800  
• b5c21103   Merge branch 'developer' of http://git.shunzhi.net/taohd/parentwork into developer ... Browse File »

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

  姚旭斌

  2018-03-24 17:32:14 +0800  
• 85477cb5   no message Browse File »
  陶汉栋

  2018-03-24 17:04:57 +0800  
• 34523b04   no message Browse File »
  陶汉栋

  2018-03-24 11:33:46 +0800  
• aa386a0f   Merge branch 'developer' into yxb_dev Browse File »
  姚旭斌

  2018-03-24 10:54:41 +0800  
• 70b2f9e0   no message Browse File »
  陶汉栋

  2018-03-24 10:52:43 +0800  
• ee59e97d   no message Browse File »
  姚旭斌

  2018-03-24 10:26:53 +0800  

23 Mar, 2018

2 commits

• c5aac4c3   no message Browse File »
  陶汉栋

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

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

22 Mar, 2018

1 commit

• 50ca3597   no message Browse File »
  张道锋

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

19 Mar, 2018

1 commit

• 2c964317   no message Browse File »
  陶汉栋

  2018-03-19 18:31:11 +0800  

15 Mar, 2018

5 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  
• 287f1d90   no message Browse File »
  陶汉栋

  2018-03-15 09:51:47 +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

5 commits

• cc09aa55   no message Browse File »
  陶汉栋

  2018-03-09 17:08:43 +0800  
• abc79afd   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev Browse File »
  姚旭斌

  2018-03-09 16:50:50 +0800  
• 96a294c3   no message Browse File »
  陶汉栋

  2018-03-09 16:47:16 +0800  
• 59f55e6b   Merge branch 'yxb_dev' of http://git.shunzhi.net/taohd/parentwork into yxb_dev ... Browse File »

  # Conflicts:
  #	app/src/main/res/values/colors.xml

  姚旭斌

  2018-03-09 15:33:28 +0800  
• 5ade1fb7   no message Browse File »
  陶汉栋

  2018-03-09 13:15:15 +0800  

05 Mar, 2018

1 commit

• 54127ffd   no message Browse File »
  陶汉栋

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