Merge branch 'master' of http://47.104.102.122:3000/lpf/sggl_cd

2024-03-28 10:20:40 +08:00
parent 138692e94b 1b96387adc
commit 53473b9f66
8 changed files with 259 additions and 128 deletions
@@ -80,7 +80,7 @@ namespace BLL
                                        PlanId = x.PlanId,
 										StartTime = x.StartTime,
 										EndTime =x.EndTime,
-										LearnTime=x.LearnTime,
+										LearningTime=x.LearnTime,
 										VideoProgress = x.VideoProgress,
                                        PersonId = x.PersonId,
                                        TrainingItemCode = x.TrainingItemCode,
@@ -150,8 +150,8 @@
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="System.Data" />
    <Reference Include="System.Xml" />
-    <Reference Include="ThoughtWorks.QRCode">
-      <HintPath>..\..\..\..\五环施工平台\SGGL_CWCEC\SGGL\BLL\bin\Debug\ThoughtWorks.QRCode.dll</HintPath>
+    <Reference Include="ThoughtWorks.QRCode, Version=1.0.4778.30637, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ThoughtWorks.QRCode.1.1.0\lib\ThoughtWorks.QRCode.dll</HintPath>
    </Reference>
    <Reference Include="WindowsBase" />
  </ItemGroup>
@@ -39,7 +39,7 @@ namespace BLL
                                    PersonId = item.UserId,
                                    TrainingItemCode = dataItem.TrainingItemCode,
                                    TrainingItemName = dataItem.TrainingItemName,
-									LearnTime = dataItem.LearnTime,
+									LearnTime = dataItem.LearningTime,
                                    AttachUrl = dataItem.AttachUrl,
                                };