Merge branch 'CJL' into temp-wxr

wxr

2021-03-26 f676a4c180fc54cc82eecbfcd24d32fe7d8581db

 HDL_ON/HDL_ON.projitems

@@ -391,6 +391,7 @@
    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\Send.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)FengLinVideo\ESOnVideo.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Energy\EnergyMainPage.cs" />

    <Compile Include="$(MSBuildThisFileDirectory)DAL\ThirdPartySdk\ESOnVideo.cs" />

  </ItemGroup>

  <ItemGroup>

    <Folder Include="$(MSBuildThisFileDirectory)DAL\" />

@@ -433,5 +434,6 @@
    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\" />

    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Video\View\" />

    <Folder Include="$(MSBuildThisFileDirectory)UI\UI2\FuntionControlView\Energy\" />

    <Folder Include="$(MSBuildThisFileDirectory)DAL\ThirdPartySdk\" />

  </ItemGroup>

</Project>