24 Mar, 2018

9 commits

• b1214481   no message Browse Code »
  葛建军

  2018-03-24 17:45:02 +0800  
• 62b816d3   commit Browse Code »
  Cao yang

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

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

  Cao yang

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

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

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

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

  Cao yang

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

  2018-03-24 15:27:03 +0800  
• 4fb40b7e   Merge branch 'parentassistant-G' into parentassistant ... Browse Code »

  * parentassistant-G:
    no message
    广告页
  
  # Conflicts:
  #	ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard

  葛建军

  2018-03-24 11:41:27 +0800  
• 047c25f6   no message Browse Code »
  葛建军

  2018-03-24 11:36:21 +0800  

23 Mar, 2018

6 commits

• 8f642321   Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan… ... Browse Code »

  …t into parentassistant

  Cao yang

  2018-03-23 18:09:19 +0800  
• f015f8e3   封装折线图空间,适配页面 Browse Code »
  Cao yang

  2018-03-23 18:09:15 +0800  
• d2bf43ab   广告页 Browse Code »
  葛建军

  2018-03-23 18:02:37 +0800  
• 55ec444b   家长助手安卓和iOS端统一修改。 Browse Code »
  葛建军

  2018-03-23 13:34:11 +0800  
• e7237aba   commit Browse Code »
  Cao yang

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

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

22 Mar, 2018

1 commit

• 3afd9170   no message Browse Code »
  葛建军

  2018-03-22 19:28:01 +0800