Merge branch 'lang' into test

Service/EquipmentInfoService.py

@@ -274,4 +274,4 @@ class EquipmentInfoService:
         for val in comb_ai_event_type:  # 组合ai类型组合，如[[2,3],[1,3]] -> [23, 13]
             val = ''.join(val)
             regroup_list.append(int(val))
-        return comb_ai_event_type
+        return regroup_list