0728

controllers/user.controller.js

@@ -43,10 +43,6 @@ const updateinfo = async (req, res) => {
 };
 const login = async (req, res) => {
   try {
-<<<<<<< HEAD
-    // console.log('login= ', req.body)
-=======
->>>>>>> origin/jaeyeoniiiiii
     const { email, password } = req.body
     const user = await User.findOne({ where: { email: email } })
     if (!user) {
@@ -68,10 +64,6 @@ const login = async (req, res) => {
       }
     }
   } catch (error) {
-<<<<<<< HEAD
-    // console.log(error)
-=======
->>>>>>> origin/jaeyeoniiiiii
     return res.status(500).send('로그인 중 에러')
   }
 };

models/user.model.js

@@ -23,7 +23,7 @@ const UserModel = (sequelize) => {
         type: DataTypes.INTEGER,
       },
       phone: {
-        type: DataTypes.INTEGER,
+        type: DataTypes.STRING,
       },
       img: {
         type: DataTypes.STRING,