Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/Controllers/Client/AClassONEController.cs

@@ -1196,6 +1196,7 @@ namespace TEAMModelOS.Controllers
                         subjectId = files.subjectId,
                         quotaId = files.quotaId,
                         quotaName = files.quotaName,
+                        uploadName = files.uploadName,
                         uploadTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
                         duration = files.duration,
                         name = files.name,
@@ -1222,6 +1223,7 @@ namespace TEAMModelOS.Controllers
                         quotaId = files.quotaId,
                         quotaName = files.quotaName,
                         updateTime = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(),
+                        uploadName = files.uploadName,
                         duration = files.duration,
                         name = files.name,
                         des = files.des,
@@ -1340,6 +1342,7 @@ namespace TEAMModelOS.Controllers
             // 0 校级 1 区级 2 市级 3 省级 4 国家级
             public int level { get; set; } = -1;
             public long uploadTime { get; set; }
+            public string uploadName { get; set; }
             public List<Attachment> files { get; set; } = new List<Attachment>();
         }