From 38a6a1c0ce7588cd07d9e97438a99385989984a4 Mon Sep 17 00:00:00 2001
From: liuhua <3207586618@qq.com>
Date: Fri, 30 Jul 2021 16:50:14 +0700
Subject: [PATCH 1/6] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=BA=86=E6=B7=BB=E5=8A=A0=E5=92=8C=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E5=8F=B8=E7=AE=80=E4=BB=8B=E5=92=8C?=
 =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC=E7=9A=84=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms-admin-frontend/src/components/Layout.vue |  4 ++
 cms-admin-frontend/src/router/routes.js      | 21 +++++++--
 cms-admin-frontend/src/views/about.vue       | 15 ++++++
 cms-admin-frontend/src/views/users/index.vue | 48 +++++++++++---------
 4 files changed, 63 insertions(+), 25 deletions(-)
 create mode 100644 cms-admin-frontend/src/views/about.vue

diff --git a/cms-admin-frontend/src/components/Layout.vue b/cms-admin-frontend/src/components/Layout.vue
index 8640e74..02833f6 100644
--- a/cms-admin-frontend/src/components/Layout.vue
+++ b/cms-admin-frontend/src/components/Layout.vue
@@ -26,6 +26,7 @@
             <!-- 点击展开收起导航和切换对应图标 -->
             <i class="el-icon-s-fold" v-show="block"></i>
             <i class="el-icon-s-unfold" v-show="toggle"></i>
+            <template> <div class="keji">@就爱科技  Love of science</div></template>
           </div>
 
           <!-- 下拉菜单 -->
@@ -177,4 +178,7 @@ export default {
   justify-content: center;
   font-size: 12px;
 }
+.keji{
+  margin-left: 45px;
+}
 </style>
diff --git a/cms-admin-frontend/src/router/routes.js b/cms-admin-frontend/src/router/routes.js
index ee34fbb..239e97f 100644
--- a/cms-admin-frontend/src/router/routes.js
+++ b/cms-admin-frontend/src/router/routes.js
@@ -37,7 +37,8 @@ const routes = [
       {
         path: 'Webset',
         meta: {
-          title: '系统管理'
+          title: '系统管理',
+          icon: 'el-icon-setting'
         },
         component: () => import('../views/sys/Webset')
       }
@@ -137,10 +138,24 @@ const routes = [
   },
   {
     path: '/about',
+    component: Layout,
     meta: {
-      title: '关于我们'
+      title: '关于我们',
+      icon: 'el-icon-user-solid'
     },
-    component: Layout
+    alwaysShow: true,
+    children: [
+      {
+        path: 'about',
+        meta: {
+          title: '关于我们',
+          icon: 'el-icon-user-solid'
+        },
+        component: () => import('../views/about')
+
+      }
+    ]
+
   },
 
   //   这个路由一定要放在最后，匹配不到上面的路由，就匹配404路由
diff --git a/cms-admin-frontend/src/views/about.vue b/cms-admin-frontend/src/views/about.vue
new file mode 100644
index 0000000..ef6df73
--- /dev/null
+++ b/cms-admin-frontend/src/views/about.vue
@@ -0,0 +1,15 @@
+<template>
+  <div>
+   <p>A</p>
+  </div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
diff --git a/cms-admin-frontend/src/views/users/index.vue b/cms-admin-frontend/src/views/users/index.vue
index c96c179..cad9d80 100644
--- a/cms-admin-frontend/src/views/users/index.vue
+++ b/cms-admin-frontend/src/views/users/index.vue
@@ -62,8 +62,8 @@
 
         <!-- <el-button type="text" size="small">是</el-button>
         <el-button type="text" size="small">否</el-button> -->
-      <el-tag type="text" size="small">是</el-tag>
-      <el-tag type="text" size="small">否</el-tag>
+        <el-tag type="text" size="small">是</el-tag>
+        <el-tag type="text" size="small">否</el-tag>
       </el-table-column>
       <el-table-column prop="enable" label="是否启用" width="130">
         <template slot-scope="scope">
@@ -177,14 +177,20 @@
 </template>
 
 <script>
-
 export default {
   methods:
-    // 编辑
+    // 用户修改(编辑)
     {
       handleClick (index, row) {
         this.dialogFormVisible = true
-        this.formData.id = 0
+        // this.formData.id = row.id
+        // this.formData.username = row.username
+        // this.formData.nickname = row.nickname
+        // this.formData.city = row.city
+        // this.formData.address = row.address
+        // this.formData.remarks = row.remarks
+
+        // 编辑时获得当前表数组中的下标
         this.currentIndex = index
         console.log(index, row)
       },
@@ -193,6 +199,12 @@ export default {
       // 添加
       handleAdd () {
         this.dialogFormVisible = true
+        // this.formData.id = 0
+        // this.formData.username = ''
+        // this.formData.nickname = ''
+        // this.formData.city = ''
+        // this.formData.address = ''
+        // this.formData.remarks = ''
       },
       // 搜索
       search () {},
@@ -212,18 +224,12 @@ export default {
   },
 
   // 当页面大小发生改变的时候，重新拉取数据
-  handlePageSizeChange () {
-
-  },
+  handlePageSizeChange () {},
   // 当页面代码发生改变的时候，重新拉取数据
-  handlePageIndexChange () {
-
-  },
+  handlePageIndexChange () {},
 
   // 拉取后台数据并且带上分页
-  formData () {
-
-  },
+  formData () {},
 
   data () {
     return {
@@ -241,16 +247,16 @@ export default {
       //   复选框  角色属性
       options: [
         {
-          value: '选项4',
+          value: '选项1',
           label: '普通会员'
         },
-        {
-          value: '选项2',
-          label: '超级管理员'
-        },
         {
           value: '选项3',
           label: 'vip会员'
+        },
+        {
+          value: '选项2',
+          label: '超级管理员'
         }
       ],
       value: '',
@@ -301,11 +307,9 @@ export default {
 }
 </script>
 <style>
-
-.block{
+.block {
   text-align: center;
   /* display: flex; */
   margin-top: 15px;
 }
-
 </style>
-- 
Gitee


From 6ce9a2d4fe1fc7de5d7a90771596ae57749e1097 Mon Sep 17 00:00:00 2001
From: liuhua <3207586618@qq.com>
Date: Sat, 31 Jul 2021 08:05:57 +0700
Subject: [PATCH 2/6] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E6=9C=AC?=
 =?UTF-8?q?=E6=9C=BA=E5=9C=B0=E5=9D=80=E7=9A=84=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CMS-Admin.Backend.Api/Data/AdminDb.cs        | 15 +++++++++++++--
 cms-admin-frontend/src/views/about.vue           | 16 +++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/CMS-admin-Backend/CMS-Admin.Backend.Api/Data/AdminDb.cs b/CMS-admin-Backend/CMS-Admin.Backend.Api/Data/AdminDb.cs
index 0144a2e..2797ebd 100644
--- a/CMS-admin-Backend/CMS-Admin.Backend.Api/Data/AdminDb.cs
+++ b/CMS-admin-Backend/CMS-Admin.Backend.Api/Data/AdminDb.cs
@@ -29,8 +29,12 @@ namespace CMS_Admin.Backend.Api.Db
         
         
 
-        protected override void OnConfiguring(DbContextOptionsBuilder builder)
-            => builder.UseSqlServer(@"server=LAPTOP-NT2O3C2R\SQLEXPRESS;database=CMS;uid=xiaoyou;pwd=5a2699yu;");
+        // protected override void OnConfiguring(DbContextOptionsBuilder builder)
+        //     => builder.UseSqlServer(@"server=LAPTOP-NT2O3C2R\SQLEXPRESS;database=CMS;uid=xiaoyou;pwd=5a2699yu;");
+
+            
+        // protected override void OnConfiguring(DbContextOptionsBuilder builder)
+        //     => builder.UseSqlServer(@"server=LAPTOP-NT2O3C2R\SQLEXPRESS;database=CMS;uid=xiaoyou;pwd=5a2699yu;");
 
 
             
@@ -41,5 +45,12 @@ namespace CMS_Admin.Backend.Api.Db
  
             // protected override void OnConfiguring(DbContextOptionsBuilder builder)
             // => builder.UseSqlServer(@"server=DESKTOP-B0M4KE7;database=CMS;uid=sa;pwd=123456;");
+            
+            // 刘
+            protected override void OnConfiguring(DbContextOptionsBuilder builder)
+            => builder.UseSqlServer(@"server=LAPTOP-47B7TGQ4\SQLEXPRESS;database=CMS;uid=sa;pwd=123456;");
+
+
+
     }
 }
\ No newline at end of file
diff --git a/cms-admin-frontend/src/views/about.vue b/cms-admin-frontend/src/views/about.vue
index ef6df73..81a68ae 100644
--- a/cms-admin-frontend/src/views/about.vue
+++ b/cms-admin-frontend/src/views/about.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
-   <p>A</p>
+   <el-row>
+  <el-col :span="24"><div class="grid-content bg-purple-dark">
+    <div >关于我们</div>
+    </div></el-col>
+</el-row>
   </div>
 </template>
 
@@ -12,4 +16,14 @@ export default {
 
 <style>
 
+  .bg-purple-dark {
+    background: #EEEE;
+  }
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 80px;
+
+  }
+
 </style>
-- 
Gitee


From 40ea04bc3c982021ac13979f228319acee7f5d8e Mon Sep 17 00:00:00 2001
From: liuhua <3207586618@qq.com>
Date: Sat, 31 Jul 2021 10:00:03 +0700
Subject: [PATCH 3/6] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms-admin-frontend/src/views/about.vue | 94 ++++++++++++++++++++++----
 1 file changed, 79 insertions(+), 15 deletions(-)

diff --git a/cms-admin-frontend/src/views/about.vue b/cms-admin-frontend/src/views/about.vue
index 81a68ae..b480d9e 100644
--- a/cms-admin-frontend/src/views/about.vue
+++ b/cms-admin-frontend/src/views/about.vue
@@ -1,29 +1,93 @@
 <template>
   <div>
-   <el-row>
-  <el-col :span="24"><div class="grid-content bg-purple-dark">
-    <div >关于我们</div>
-    </div></el-col>
-</el-row>
+    <el-row>
+      <el-col :span="24"
+        ><div class="grid-content bg-purple-dark">
+          <div class="about">关于我们</div>
+        </div></el-col
+      >
+    </el-row>
+
+    <!-- 内容区 -->
+    <el-main class="contents">
+
+        就爱科技有限公司位于中国福建省龙岩市，一直坚持“恪守信誉、诚信经营”的经营理念。公司成立于多看年，有着多年广告产品制作经验，是一家深受客户青睐的从事广告策划、设计、制作、发布、安装于一体的综合性机构.
+        公司自备厂房和一群广告策划师、设计师及制作安装师傅。工作多年的策划师，娴熟的技工，客户为本的理念和诚心的服务的态度是我们在广告的市场竞争中脱颖而出的制胜方案.
+        公司自成立以来，凭借坚实的基础，积累了丰富的广告策划和设计经验，取得了很快的发展，逐渐形成了新颖的广告理念和定位.我们坚持“诚信为本，客户至上”的原则，把客户要求做好，急客户之所需，想客户之所想，力求为客户提供有价值的广告与服务，加高客户的竞争力，我们不做缺乏水准的作品，不允许浪费顾客的宝贵时间和一分多余的钱。
+
+    </el-main>
+
+    <!-- 底部 -->
+    <div>
+      <el-row>
+        <el-col :span="24"
+          ><div class="grid-contents bg-purple-darks">
+            <div class="pod_bottom" >
+            <br>
+            COPYRIGHT © 2017-2018 上海和闽广告有限公司 保留所有权利
+            <br>
+            WWW.SH-HEMIN.COM 服务热线：021-54160641 021-5296 8078
+            <br>
+            地址：上海市青浦区崧泽大道558弄82号 手机：15021785818
+            <br>
+            邮箱：SHYAMEIJIA@163.COM 豫ICP备12021735号
+            <br>
+            声明：本站部分内容搜集与互联网，如果侵犯到您的权益请联系我们24小时内删除。
+            </div>
+          </div></el-col
+        >
+      </el-row>
+    </div>
   </div>
 </template>
 
 <script>
-export default {
-
-}
+export default {}
 </script>
 
 <style>
+.bg-purple-dark {
+  background: #eeee;
+}
 
-  .bg-purple-dark {
-    background: #EEEE;
-  }
+.grid-content {
+  border-radius: 4px;
+  min-height: 80px;
+}
+.about {
+  margin-left: 35px;
+  font-size: 20px;
+  padding-top: 20px;
+}
 
-  .grid-content {
-    border-radius: 4px;
-    min-height: 80px;
+/* 内容区 */
+.content {
+  padding-top: 20px;
+}
+.contents{
+  /* background-color:#d7def3; */
+}
+
+/* 底部版权信息 */
+
+.bg-purple-darks {
+  /* background: #eeee; */
+  background-color:#000000;
+
+}
 
-  }
+.grid-contents {
+  border-radius: 4px;
+  min-height: 150px;
+  margin-top: 270px;
 
+}
+
+.pod_bottom{
+  text-align: center;
+  line-height: 20px;
+  color:#919399;
+  font-size: 14px;
+
+}
 </style>
-- 
Gitee


From 167166e6da1f9133e73a71ae10e1be8d0ca097b3 Mon Sep 17 00:00:00 2001
From: liuhua <3207586618@qq.com>
Date: Sat, 31 Jul 2021 11:12:33 +0700
Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BC=96=E8=BE=91=E5=A4=A7=E4=BD=93=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=EF=BC=8C=E6=9C=89=E5=BE=85=E4=BF=AE=E6=94=B9=E7=BB=86?=
 =?UTF-8?q?=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms-admin-frontend/src/views/about.vue | 110 ++++++++++++++++---------
 1 file changed, 69 insertions(+), 41 deletions(-)

diff --git a/cms-admin-frontend/src/views/about.vue b/cms-admin-frontend/src/views/about.vue
index b480d9e..03e9197 100644
--- a/cms-admin-frontend/src/views/about.vue
+++ b/cms-admin-frontend/src/views/about.vue
@@ -1,43 +1,71 @@
 <template>
   <div>
-    <el-row>
-      <el-col :span="24"
-        ><div class="grid-content bg-purple-dark">
-          <div class="about">关于我们</div>
-        </div></el-col
-      >
-    </el-row>
-
-    <!-- 内容区 -->
     <el-main class="contents">
+      <el-row>
+        <el-col :span="24"
+          ><div class="grid-content bg-purple-dark">
+            <div class="about">关于我们</div>
+          </div></el-col
+        >
+      </el-row>
 
+      <!-- 内容区 -->
+      <el-card class="filleted">
         就爱科技有限公司位于中国福建省龙岩市，一直坚持“恪守信誉、诚信经营”的经营理念。公司成立于多看年，有着多年广告产品制作经验，是一家深受客户青睐的从事广告策划、设计、制作、发布、安装于一体的综合性机构.
         公司自备厂房和一群广告策划师、设计师及制作安装师傅。工作多年的策划师，娴熟的技工，客户为本的理念和诚心的服务的态度是我们在广告的市场竞争中脱颖而出的制胜方案.
         公司自成立以来，凭借坚实的基础，积累了丰富的广告策划和设计经验，取得了很快的发展，逐渐形成了新颖的广告理念和定位.我们坚持“诚信为本，客户至上”的原则，把客户要求做好，急客户之所需，想客户之所想，力求为客户提供有价值的广告与服务，加高客户的竞争力，我们不做缺乏水准的作品，不允许浪费顾客的宝贵时间和一分多余的钱。
+      </el-card>
 
-    </el-main>
+      <el-card class="picture">
+        <img
+          src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fwww.gxcyzs.com%2Fuploadfiles%2Fpictures%2Fnews%2F20200311225454_7136.jpg&refer=http%3A%2F%2Fwww.gxcyzs.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1630290353&t=0a29aa9c6b1ed32c6a13d0c8f21a9a26"
+          alt=""
+          height="300px"
+          style="padding: 0px 50px"
+        />
+        <img
+          src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.zx123.cn%2FResources%2Fzx123cn%2Fuploadfile%2F2020%2F0604%2Feaf27044c628537e1e6e0f54fd63c470.jpg&refer=http%3A%2F%2Fimg.zx123.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1630290353&t=2b3b6fc140655cdee21c4a96cc9a2bbc"
+          alt=""
+          height="300px"
+          style="padding: 0px 0px 0px 200px"
+        />
+        <img
+          src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsz.qizuang.com%2Fupload%2Fcase%2Fm_507e097373251.jpg&refer=http%3A%2F%2Fsz.qizuang.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1630290353&t=6b8aca787244a06bf7afb76bf0c13f15"
+          alt=""
+          height="300px"
+          style="padding: 10px 50px"
+        />
+        <img
+          src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.zx123.cn%2FResources%2Fzx123cn%2Fuploadfile%2F2019%2F0511%2F1cabb2c9f6c838a6eee89db950d81514.png&refer=http%3A%2F%2Fimg.zx123.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1630290353&t=bd184ca9b22d63920ff033bfa635b56d"
+          alt=""
+          height="300px"
+          style="padding:10px 50px"
+        />
+      </el-card>
 
-    <!-- 底部 -->
-    <div>
-      <el-row>
-        <el-col :span="24"
-          ><div class="grid-contents bg-purple-darks">
-            <div class="pod_bottom" >
-            <br>
-            COPYRIGHT © 2017-2018 上海和闽广告有限公司 保留所有权利
-            <br>
-            WWW.SH-HEMIN.COM 服务热线：021-54160641 021-5296 8078
-            <br>
-            地址：上海市青浦区崧泽大道558弄82号 手机：15021785818
-            <br>
-            邮箱：SHYAMEIJIA@163.COM 豫ICP备12021735号
-            <br>
-            声明：本站部分内容搜集与互联网，如果侵犯到您的权益请联系我们24小时内删除。
-            </div>
-          </div></el-col
-        >
-      </el-row>
-    </div>
+      <div></div>
+      <!-- 底部 -->
+      <div>
+        <el-row>
+          <el-col :span="24"
+            ><div class="grid-contents bg-purple-darks">
+              <div class="pod_bottom">
+                <br />
+                COPYRIGHT © 2017-2018 福建龙岩9爱科技有限公司 保留所有权利
+                <br />
+                WWW.SH-HEMIN.COM 服务热线：021-54160641 021-5296 8078
+                <br />
+                地址：福建省龙岩市558弄82号 手机：15021785818
+                <br />
+                邮箱：SHYAM@163.COM 豫ICP备120号
+                <br />
+                声明：本站部分内容搜集与互联网，如果侵犯到您的权益请联系我们24小时内删除。
+              </div>
+            </div></el-col
+          >
+        </el-row>
+      </div>
+    </el-main>
   </div>
 </template>
 
@@ -62,32 +90,32 @@ export default {}
 
 /* 内容区 */
 .content {
-  padding-top: 20px;
+  background-color: #ffffff;
+  margin-top: 10px;
 }
-.contents{
-  /* background-color:#d7def3; */
+
+.filleted {
+  border-radius: 15px;
+  background-color: #def0d0;
 }
 
 /* 底部版权信息 */
 
 .bg-purple-darks {
   /* background: #eeee; */
-  background-color:#000000;
-
+  background-color: #000000;
 }
 
 .grid-contents {
   border-radius: 4px;
   min-height: 150px;
-  margin-top: 270px;
-
+  margin-top: 100px;
 }
 
-.pod_bottom{
+.pod_bottom {
   text-align: center;
   line-height: 20px;
-  color:#919399;
+  color: #919399;
   font-size: 14px;
-
 }
 </style>
-- 
Gitee


From 964e75f51ebf1a60ff719b54d5beac5f661902a1 Mon Sep 17 00:00:00 2001
From: liuhua <3207586618@qq.com>
Date: Sat, 31 Jul 2021 14:08:30 +0700
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E5=85=B3?=
 =?UTF-8?q?=E4=BA=8E=E6=88=91=E4=BB=AC=E7=9A=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cms-admin-frontend/src/views/about.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/cms-admin-frontend/src/views/about.vue b/cms-admin-frontend/src/views/about.vue
index 03e9197..904e9e1 100644
--- a/cms-admin-frontend/src/views/about.vue
+++ b/cms-admin-frontend/src/views/about.vue
@@ -23,11 +23,14 @@
           height="300px"
           style="padding: 0px 50px"
         />
+
+        公司办公环境
+
         <img
           src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fimg.zx123.cn%2FResources%2Fzx123cn%2Fuploadfile%2F2020%2F0604%2Feaf27044c628537e1e6e0f54fd63c470.jpg&refer=http%3A%2F%2Fimg.zx123.cn&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1630290353&t=2b3b6fc140655cdee21c4a96cc9a2bbc"
           alt=""
           height="300px"
-          style="padding: 0px 0px 0px 200px"
+          class="script"
         />
         <img
           src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fsz.qizuang.com%2Fupload%2Fcase%2Fm_507e097373251.jpg&refer=http%3A%2F%2Fsz.qizuang.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1630290353&t=6b8aca787244a06bf7afb76bf0c13f15"
@@ -98,6 +101,12 @@ export default {}
   border-radius: 15px;
   background-color: #def0d0;
 }
+.script{
+margin-left: 100px;
+}
+.picture{
+  text-align: initial;
+}
 
 /* 底部版权信息 */
 
-- 
Gitee


From be3907dd3a8374931e9275f58ecb508fa9bf06e9 Mon Sep 17 00:00:00 2001
From: liuhua <3207586618@qq.com>
Date: Sat, 31 Jul 2021 14:31:22 +0700
Subject: [PATCH 6/6] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CMS-Admin.Backend.Api/Data/AdminDb.cs             | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/CMS-admin-Backend/CMS-Admin.Backend.Api/Data/AdminDb.cs b/CMS-admin-Backend/CMS-Admin.Backend.Api/Data/AdminDb.cs
index effce69..8386e70 100644
--- a/CMS-admin-Backend/CMS-Admin.Backend.Api/Data/AdminDb.cs
+++ b/CMS-admin-Backend/CMS-Admin.Backend.Api/Data/AdminDb.cs
@@ -33,10 +33,6 @@ namespace CMS_Admin.Backend.Api.Db
         //     => builder.UseSqlServer(@"server=LAPTOP-NT2O3C2R\SQLEXPRESS;database=CMS;uid=xiaoyou;pwd=5a2699yu;");
 
             
-        // protected override void OnConfiguring(DbContextOptionsBuilder builder)
-        //     => builder.UseSqlServer(@"server=LAPTOP-NT2O3C2R\SQLEXPRESS;database=CMS;uid=xiaoyou;pwd=5a2699yu;");
-
-
 
         protected override void OnModelCreating(ModelBuilder model)
         {
@@ -174,12 +170,10 @@ namespace CMS_Admin.Backend.Api.Db
 
 
 
-
         // protected override void OnConfiguring(DbContextOptionsBuilder builder)
         //     => builder.UseSqlServer(@"server=.;database=CMS;uid=sa;pwd=123456;");
 
 
-<<<<<<< HEAD
  
             // protected override void OnConfiguring(DbContextOptionsBuilder builder)
             // => builder.UseSqlServer(@"server=DESKTOP-B0M4KE7;database=CMS;uid=sa;pwd=123456;");
@@ -190,10 +184,5 @@ namespace CMS_Admin.Backend.Api.Db
 
 
 
-=======
-
-        // protected override void OnConfiguring(DbContextOptionsBuilder builder)
-        // => builder.UseSqlServer(@"server=DESKTOP-B0M4KE7;database=CMS;uid=sa;pwd=123456;");
->>>>>>> 6cbfbc8e7761c84028b47eb304dd5afd63e24020
     }
 }
\ No newline at end of file
-- 
Gitee