diff --git a/.env b/.env
index d202065..f6d7a7d 100644
--- a/.env
+++ b/.env
@@ -30,10 +30,10 @@ VITE_OAUTH2_MOBILE_CLIENT='app:app'
 VITE_OAUTH2_SOCIAL_CLIENT='social:social'
 
 # 是否开启前端滑块验证码
-VITE_VERIFY_ENABLE = true
+VITE_VERIFY_ENABLE = false
 
 # 是否开启前端图形验证码
-VITE_VERIFY_IMAGE_ENABLE = false
+VITE_VERIFY_IMAGE_ENABLE = true
 
 # 是否开启websocket 消息接受,
 VITE_WEBSOCKET_ENABLE = false
diff --git a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
index a021459..8b915da 100644
--- a/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
+++ b/src/views/supermarketerp/supermarketSpu/components/package-unit.vue
@@ -208,45 +208,6 @@ const slotInputChange = (slotParams: any) => {
 		$table.updateStatus(slotParams)
 	}
 }
-
-// 底部新增行
-<<<<<<< HEAD
-const pushEvent = (row?: rowVU | undefined) => {
-	const newRow = {} as rowVU
-	if (row) {
-		Object.assign(newRow, row)
-	} else {
-1    row = {
-      id: "tmp_" + nanoid(5),
-      barCode: "",
-      spec: "",
-      unit: "",
-      status: "0",
-      packageNum: 1,
-      purchasePrice: 0,
-      retailPrice: 0.01,
-      promotionPrice: 0,
-      costPrice: 0,
-      tasteName: "",
-      tasteId: "",
-    }
-    Object.assign(newRow, row)1
-    const pushEvent = (flag?: "flag" | undefined) => {
-      const newRow: rowVU = {
-        id: "tmp_" + nanoid(5),
-        barCode: "",
-        spec: "",
-        unit: "",
-        status: "0",
-        packageNum: 1,
-        purchasePrice: 0,
-        retailPrice: 0.01,
-        promotionPrice: 0,
-        costPrice: 0,
-        tasteName: "",
-        tasteId: "",
-      }
-=======
 const pushEvent = (flag?: "flag" | undefined) => {
 	const newRow: rowVU = {
 		id: "tmp_" + nanoid(5),
@@ -262,7 +223,6 @@ const pushEvent = (flag?: "flag" | undefined) => {
 		tasteName: "",
 		tasteId: "",
 	}
->>>>>>> 09ed9cd1a67bafec7fdb6796de0dcfbb0b357dec
 
       if (flag) newRow.flag = "defaultPackageUnitRow"