|
|
@@ -291,8 +291,6 @@ class User_resume(Model):
|
|
|
"media": self.media,
|
|
|
"imgs": self.imgs,
|
|
|
"introduction": self.introduction
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
}
|
|
|
|
|
|
class Tgc_pic(Model):
|
|
|
@@ -319,5 +317,4 @@ class Tgc_report(Model):
|
|
|
"title": self.title,
|
|
|
"create_time": self.create_time,
|
|
|
"url": self.url
|
|
|
->>>>>>> 01af6c4a39305844d58fd72484a523aadc029b7c
|
|
|
}
|
