From 797858c5f81f708ae8896bf3186d2ac0aa3b4d78 Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期三, 17 五月 2023 18:51:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/ShengWei
---
WorkM/WorkM.csproj | 25 +++++-------
NETERP/NETERP.csproj | 2
WorkM/Form3.Designer.cs | 40 ++++++++++++++++++++
WorkM/Form3.cs | 19 +++++++++
4 files changed, 71 insertions(+), 15 deletions(-)
diff --git a/NETERP/NETERP.csproj b/NETERP/NETERP.csproj
index 2e8d086..a76995e 100644
--- a/NETERP/NETERP.csproj
+++ b/NETERP/NETERP.csproj
@@ -187,7 +187,7 @@
<Name>SQLHelper</Name>
</ProjectReference>
<ProjectReference Include="..\WorkM\WorkM.csproj">
- <Project>{38499782-D273-45EE-A5A4-19AC1FC36444}</Project>
+ <Project>{38499782-d273-45ee-a5a4-19ac1fc36444}</Project>
<Name>WorkM</Name>
</ProjectReference>
</ItemGroup>
diff --git a/WorkM/Form3.Designer.cs b/WorkM/Form3.Designer.cs
new file mode 100644
index 0000000..83c9244
--- /dev/null
+++ b/WorkM/Form3.Designer.cs
@@ -0,0 +1,40 @@
+锘�
+namespace WorkM
+{
+ partial class Form3
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.components = new System.ComponentModel.Container();
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(800, 450);
+ this.Text = "Form3";
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
diff --git a/WorkM/Form3.cs b/WorkM/Form3.cs
new file mode 100644
index 0000000..39d2ea6
--- /dev/null
+++ b/WorkM/Form3.cs
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+
+namespace WorkM
+{
+ public partial class Form3 : Form
+ {
+ public Form3()
+ {
+ InitializeComponent();
+ }
+ }
+}
diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index e296906..00c2248 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.csproj
@@ -84,6 +84,12 @@
<Compile Include="Form2.Designer.cs">
<DependentUpon>Form2.cs</DependentUpon>
</Compile>
+ <Compile Include="Form3.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Form3.Designer.cs">
+ <DependentUpon>Form3.cs</DependentUpon>
+ </Compile>
<Compile Include="Gy_DataIn_PayMent.cs">
<SubType>Form</SubType>
</Compile>
@@ -502,15 +508,6 @@
<WrapperTool>tlbimp</WrapperTool>
<Isolated>False</Isolated>
</COMReference>
- <COMReference Include="Microsoft.Office.Core">
- <Guid>{2DF8D04C-5BFA-101B-BDE5-00AA0044DE52}</Guid>
- <VersionMajor>2</VersionMajor>
- <VersionMinor>8</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>primary</WrapperTool>
- <Isolated>False</Isolated>
- <Private>True</Private>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
@@ -785,7 +782,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BLL\BLL.csproj">
- <Project>{0BF3D95A-4A7B-45FB-92FB-9A5BB374B750}</Project>
+ <Project>{0bf3d95a-4a7b-45fb-92fb-9a5bb374b750}</Project>
<Name>BLL</Name>
</ProjectReference>
<ProjectReference Include="..\DAL\DAL.csproj">
@@ -793,7 +790,7 @@
<Name>DAL</Name>
</ProjectReference>
<ProjectReference Include="..\DBUtility\DBUtility.csproj">
- <Project>{F2098F1B-4FA1-49BB-91EA-AB3522008F28}</Project>
+ <Project>{f2098f1b-4fa1-49bb-91ea-ab3522008f28}</Project>
<Name>DBUtility</Name>
</ProjectReference>
<ProjectReference Include="..\Model\Model.csproj">
@@ -801,15 +798,15 @@
<Name>Model</Name>
</ProjectReference>
<ProjectReference Include="..\Pub_Class\Pub_Class.csproj">
- <Project>{0DE3C6C4-9C87-4B8C-AC86-AC15B7AFE731}</Project>
+ <Project>{0de3c6c4-9c87-4b8c-ac86-ac15b7afe731}</Project>
<Name>Pub_Class</Name>
</ProjectReference>
<ProjectReference Include="..\Pub_Control\Pub_Control.csproj">
- <Project>{F7838319-779C-4AD9-A59F-5DCB5757F335}</Project>
+ <Project>{f7838319-779c-4ad9-a59f-5dcb5757f335}</Project>
<Name>Pub_Control</Name>
</ProjectReference>
<ProjectReference Include="..\SQLHelper\SQLHelper.csproj">
- <Project>{0A4EF483-D8D3-49A5-8378-974EF7993365}</Project>
+ <Project>{0a4ef483-d8d3-49a5-8378-974ef7993365}</Project>
<Name>SQLHelper</Name>
</ProjectReference>
</ItemGroup>
--
Gitblit v1.9.1