24 Mar, 2018

11 commits

• e90237f3   Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »

  …t into parentassistant
  
  # Conflicts:
  #	ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard

  Cao yang

  2018-03-24 17:55:49 +0800  
• e2bed55c   commit Browse File »
  Cao yang

  2018-03-24 17:55:12 +0800  
• ae179549   Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »

  …t into parentassistant
  
  * 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistant:
    手动隐藏空白页

  葛建军

  2018-03-24 17:45:38 +0800  
• 866dc83e   给折线图添加虚线和下划线 Browse File »
  Cao yang

  2018-03-24 17:45:12 +0800  
• 86839389   手动隐藏空白页 Browse File »
  Cao yang

  2018-03-24 15:55:30 +0800  
• 62b816d3   commit Browse File »
  Cao yang

  2018-03-24 15:49:42 +0800  
• 680290e7   Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »

  …t into parentassistant
  
  # Conflicts:
  #	ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate

  Cao yang

  2018-03-24 15:49:01 +0800  
• 977aef3c   commit Browse File »
  Cao yang

  2018-03-24 15:47:35 +0800  
• eb22308c   合并冲突 Browse File »
  Cao yang

  2018-03-24 15:39:12 +0800  
• 8b892b8e   Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse File »

  …t into parentassistant
  
  # Conflicts:
  #	ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard

  Cao yang

  2018-03-24 15:28:21 +0800  
• 8a4950fa   页面尺寸规范,完善页面 Browse File »
  Cao yang

  2018-03-24 15:27:03 +0800  

23 Mar, 2018

3 commits

• f015f8e3   封装折线图空间,适配页面 Browse File »
  Cao yang

  2018-03-23 18:09:15 +0800  
• e7237aba   commit Browse File »
  Cao yang

  2018-03-23 10:23:59 +0800  
• 58c1dc9c   提交 Browse File »
  Cao yang

  2018-03-23 10:01:38 +0800