Merge branch 'master-server'

@@ -43,10 +43,10 @@ class BTemplateModuleProjectLogic extends BaseLogic
         foreach ($list as $k1 => $v1){
         foreach ($list as $k1 => $v1){
             foreach ($label_arr as $v2){
             foreach ($label_arr as $v2){
                 if($v2['template_id'] == $v1['id']){
                 if($v2['template_id'] == $v1['id']){
-                    $v1['label'] = $v2;
-                    $list[$k1] = $v1;
+                    $v1['label'][] = $v2;
                 }
                 }
             }
             }
+            $list[$k1] = $v1;
         }
         }
         return $this->success($list);
         return $this->success($list);
     }
     }