fix

routers/census.go

@@ -11,13 +11,10 @@ func InitCensus(rg *gin.RouterGroup) {
 	inv := new(census.InvoicePaymentController)
 	invGroup := rg.Group("invoice_payment/").Use(middleware.Token())
 	invGroup.GET("list", inv.List)
-<<<<<<< HEAD
 	invGroup.GET("not_invoice/list", inv.NotInvoiceList)
 	invGroup.GET("not_payment/list", inv.NotPaymentList)
-
-=======
 	invGroup.GET("income/list", inv.IncomeList)
->>>>>>> fms_2.8
+
 
 	// 销售
 	sel := new(census.SellerController)