修改冲突文件

README.md

@@ -55,8 +55,7 @@
     md5(md5(md5(CodeString)+md5(AppKey))+AppKey)
 ```
 
-<<<<<<< HEAD
-=======
+
 
 ## 开发日志
 
@@ -155,4 +154,4 @@ F:\goobject\src\key_performance_indicators\api\version1\departmentseting\departm
 预留判断该指标是否在使用中
 
 ```
->>>>>>> v1_dev
+

api/version1/honoraryArchives/honors.go

@@ -108,11 +108,9 @@ func (a *ApiMethod) AddHonorCont(c *gin.Context) {
 	honorCont.Time = time.Now().Unix() //创建时间"`
 	honorCont.State = 1                //状态（1：启用；2：禁用；3：删除）"`
 	if len(requestData.ImgUrl) > 0 {
-<<<<<<< HEAD
-		var imgList []models.PhotosGallery //图片档案
-=======
+
 		var imgList []modelshonory.PhotosGallery
->>>>>>> v1_dev
+
 		for _, v := range requestData.ImgUrl {
 			var imgCont modelshonory.PhotosGallery
 			imgCont.Url = v.Url                               //图片地址"`