Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserAppController.java

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserAppController.java

@@ -1,16 +1,12 @@
 package com.pj.tb_purchaser;
 
 import com.pj.api.dto.PurchaserDto;
-import com.pj.tb_purchaser.param.PurchaserParam;
 import com.pj.utils.sg.AjaxJson;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.text.ParseException;
 
 
 /**
@@ -41,7 +37,7 @@ public class TbPurchaserAppController {
 
 	/** 收购商认证 */
 	@RequestMapping("identification")
-	public AjaxJson identification(@RequestBody @Validated PurchaserParam purchaser) throws ParseException {
+	public AjaxJson identification(TbPurchaser purchaser) {
 		boolean identification = tbPurchaserService.identification(purchaser);
 		if(!identification) return AjaxJson.getError("收购商认证信息提交失败!!!");