From 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 27 十月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' into master_ben
---
Tiger.Model.Net/Tiger.Model.Net.csproj | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/Tiger.Model.Net/Tiger.Model.Net.csproj b/Tiger.Model.Net/Tiger.Model.Net.csproj
index d369ac4..c8a8462 100644
--- a/Tiger.Model.Net/Tiger.Model.Net.csproj
+++ b/Tiger.Model.Net/Tiger.Model.Net.csproj
@@ -9,6 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Tiger.Model</RootNamespace>
<AssemblyName>Tiger.Model</AssemblyName>
+ <Company>娣卞湷甯傞挍鏍间簯绉戞妧鏈夐檺鍏徃 (SZ TigerClouds Technology Co.,Ltd.)</Company>
+ <Authors>TigerClouds Team</Authors>
+ <Copyright>Copyright 漏 2020-2025 SZ TigerClouds Technology Co.,Ltd.. All rights reserved.</Copyright>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
@@ -58,8 +61,8 @@
<ErrorReport>prompt</ErrorReport>
</PropertyGroup>
<ItemGroup>
- <Reference Include="SqlSugar, Version=5.1.4.149, Culture=neutral, processorArchitecture=MSIL">
- <HintPath>..\packages\SqlSugar.5.1.4.149\lib\SqlSugar.dll</HintPath>
+ <Reference Include="SqlSugar, Version=5.1.4.168, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\SqlSugar.5.1.4.169\lib\SqlSugar.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
@@ -85,6 +88,7 @@
<Compile Include="Entitys\BAS\BAS_DFT_DUTY.cs" />
<Compile Include="Entitys\BAS\BAS_DFT_LOC.cs" />
<Compile Include="Entitys\BAS\BAS_ITEM_CUST.cs" />
+ <Compile Include="Entitys\BAS\BAS_ITEM_EXT.cs" />
<Compile Include="Entitys\BAS\BAS_LABEL_PV.cs" />
<Compile Include="Entitys\BAS\BAS_LABEL_TEMP.cs" />
<Compile Include="Entitys\BAS\BAS_LABEL_VAR.cs" />
@@ -166,6 +170,7 @@
<Compile Include="Entitys\MES\ParameterEntity\SmtLoadingInput.cs" />
<Compile Include="Entitys\MES\ParameterEntity\PositionParameter.cs" />
<Compile Include="Entitys\MES\ParameterEntity\RouteInput.cs" />
+ <Compile Include="Entitys\MES\ParameterEntity\TskParameter.cs" />
<Compile Include="Entitys\MES\ParameterEntity\U9C_MES_Input.cs" />
<Compile Include="Entitys\MES\R_Wip_Tracking_T.cs" />
<Compile Include="Entitys\MES\SMT_FEEDER.cs" />
@@ -197,6 +202,7 @@
<Compile Include="Entitys\MES\YadaU9\mes_BomDetail.cs" />
<Compile Include="Entitys\MES\YadaU9\mes_BomMaster.cs" />
<Compile Include="Entitys\MES\YadaU9\mes_Customer.cs" />
+ <Compile Include="Entitys\MES\YadaU9\mes_HisBoxBarCode.cs" />
<Compile Include="Entitys\MES\YadaU9\mes_ItemMaster.cs" />
<Compile Include="Entitys\MES\YadaU9\mes_Mo.cs" />
<Compile Include="Entitys\MES\YadaU9\mes_MoBarCode.cs" />
@@ -212,6 +218,7 @@
<Compile Include="Entitys\QMS\QMS_INS_STD.cs" />
<Compile Include="Entitys\QMS\QMS_SAMPLE_RULE.cs" />
<Compile Include="Entitys\SYS\LOG_CS_LOGIN.cs" />
+ <Compile Include="Entitys\SYS\LOG_LABEL_PRINT.cs" />
<Compile Include="Entitys\SYS\LOG_PDA_LOGIN.cs" />
<Compile Include="Entitys\SYS\SYS_CS_LOGIN.cs" />
<Compile Include="Entitys\SYS\SYS_LOW_CODE.cs" />
--
Gitblit v1.9.3