Browse Source

Merge branch 'test' of git@git.coding.net:aft/AFT.git into test

wanghui 8 years ago
parent
commit
cf44d70806

+ 1 - 1
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -61,7 +61,7 @@
     d.fixed_scheme AS fixedScheme, d.cost_escrow AS costEscrow, d.budget_cost AS budgetCost, d.validity_period as validityPeriod, d.employer_id AS employerId, d.employer_name AS employerName, 
     d.employer_address AS employerAddress, d.employer_contacts AS employerContacts, d.employer_contacts_mobile AS employerContactsMobile, d.employer_contacts_mailbox AS employerContactsMailbox, 
     d.contacts, d.status, d.release_status AS releaseStatus, d.release_date AS releaseDate , d.create_time AS createTime, d.principal_id AS principalId, d.deleted_sign AS deletedSign,
-    d.audit_status AS auditStatus, d.tech_broker_id AS techBrokerId,d.boutique,d.urgent_money AS urgentDoney,d.urgent_days as urgentDays
+    d.audit_status AS auditStatus, d.tech_broker_id AS techBrokerId,d.boutique,d.urgent_money AS urgentMoney,d.urgent_days as urgentDays
     ,ifnull(t.x,0) as orderIntentionCount,ifnull(t2.x,0) as orderCount
     from demand d
     left join (select count(0) as x,commodity_id from t_order

+ 10 - 1
src/main/java/com/goafanti/news/controller/NewsController.java

@@ -157,5 +157,14 @@ public class NewsController extends BaseController {
 		modelview.setViewName("/portal/news/appCognizance");
 		return modelview;
 	}
-
+	
+	/**
+	 * APP注册协议
+	 */
+	@RequestMapping(value = "/portal/news/agreement", method = RequestMethod.GET)
+	public ModelAndView agreement(HttpServletRequest request, ModelAndView modelview) {
+		modelview.setViewName("/portal/news/agreement");
+		return modelview;
+	}
+	
 }

File diff suppressed because it is too large
+ 62 - 0
src/main/webapp/WEB-INF/views/portal/news/agreement.html