工单相关接口

src/dashoo.cn/backend/api/routers/router.go

@@ -489,17 +489,16 @@ func init() {
 				&oilcontract.OilContractReviewController{},
 			),
 		),
-<<<<<<< HEAD
 		// 合同评价明细
 		beego.NSNamespace("/contract-evaluation",
 			beego.NSInclude(
 				&oilcontract.OilContractEvaluationItemsController{},
-=======
+			),
+		),
 		// 合同评价工单
 		beego.NSNamespace("/contract-order",
 			beego.NSInclude(
 				&oilcontract.OilContractEvaluationOrderController{},
->>>>>>> 工单相关接口
 			),
 		),
 	)