From 082f27685f9c57eca8ff1eca4fe5535520851564 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Sat, 18 Apr 2026 20:05:27 +0800
Subject: [PATCH] 1

---
 HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj    | 39 ++++++++++++++++++-
 .../FineUIPro.Web/FineUIPro.Web.csproj.user   |  2 +-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
index c7164e6..3b58852 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1156,6 +1156,18 @@
     <Content Include="HJGL\HotProessManage\HotProessTrustItemEdit.aspx" />
     <Content Include="HJGL\HotProessManage\RepairHotProessTrust.aspx" />
     <Content Include="HJGL\HotProessManage\RepairHotProessTrustEdit.aspx" />
+    <Content Include="HJGL\JoinMarking\assets\main-DE8eQLmE.js" />
+    <Content Include="HJGL\JoinMarking\assets\main-DSskaVYi.css" />
+    <Content Include="HJGL\JoinMarking\assets\pdf-lib-D5zKcp81.js" />
+    <Content Include="HJGL\JoinMarking\assets\pdfjs-HfNT2Y4W.js" />
+    <Content Include="HJGL\JoinMarking\assets\styles-Bno-H3Kc.js" />
+    <Content Include="HJGL\JoinMarking\assets\styles-CDHjsf7D.css" />
+    <Content Include="HJGL\JoinMarking\assets\viewer-BilNgxa5.css" />
+    <Content Include="HJGL\JoinMarking\assets\viewer-Dla4Cfl-.js" />
+    <Content Include="HJGL\JoinMarking\JoinMarking.aspx" />
+    <Content Include="HJGL\JoinMarking\JointShow.aspx" />
+    <Content Include="HJGL\JoinMarking\PDFMarking.aspx" />
+    <Content Include="HJGL\JoinMarking\PDFShow.aspx" />
     <Content Include="HJGL\Match\InStorage.aspx" />
     <Content Include="HJGL\Match\PipelineConditionsQuery.aspx" />
     <Content Include="HJGL\Match\PipelineMaterialsDistribution.aspx" />
@@ -5880,6 +5892,32 @@
     <Compile Include="HJGL\HotProessManage\RepairHotProessTrustEdit.aspx.designer.cs">
       <DependentUpon>RepairHotProessTrustEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="HJGL\JoinMarking\JoinMarking.aspx.cs">
+      <DependentUpon>JoinMarking.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\JoinMarking.aspx.designer.cs">
+      <DependentUpon>JoinMarking.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\JointShow.aspx.cs">
+      <DependentUpon>JointShow.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\JointShow.aspx.designer.cs">
+      <DependentUpon>JointShow.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\PDFMarking.aspx.cs">
+      <DependentUpon>PDFMarking.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\PDFMarking.aspx.designer.cs">
+      <DependentUpon>PDFMarking.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\PDFShow.aspx.cs">
+      <DependentUpon>PDFShow.aspx</DependentUpon>
+    </Compile>
+    <Compile Include="HJGL\JoinMarking\PDFShow.aspx.designer.cs">
+      <DependentUpon>PDFShow.aspx</DependentUpon>
+    </Compile>
     <Compile Include="HJGL\Match\InStorage.aspx.cs">
       <DependentUpon>InStorage.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
@@ -8270,7 +8308,6 @@
     <Folder Include="App_Themes\Default\Images\" />
     <Folder Include="common\ReportPrint\upload\" />
     <Folder Include="File\Image\" />
-    <Folder Include="HJGL\JoinMarking\" />
     <Folder Include="SeetaFaceDir\modelimages\" />
     <Folder Include="tmpupload\" />
     <Folder Include="WeldMat\res\js\vendor\" />
diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
index e3436b8..80f7761 100644
--- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <UseIISExpress>true</UseIISExpress>