Merge branch 'davidhuang' into develop

* davidhuang:
  我的积分 使用真实数据

# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/V/YHScorePersonInfoCell.swift

@@ -192,7 +192,7 @@ extension YHScorePersonInfoCell {
             return
         }
         
-        nameLable.text = "DavidHuang for test"//model.user_info?.username ?? "-"
+        nameLable.text = model.user_info?.username ?? "-"
         phoneLable.text = model.user_info?.mobile ?? "-"
         
         let score : String = String(model.total_score?.sum_score ?? 0)