Merge remote-tracking branch 'origin/master'

picc-admin-server/src/main/java/com/jpsoft/picc/modules/business/controller/InsuranceApplicationController.java

@@ -131,7 +131,7 @@ public class InsuranceApplicationController {
     @ApiImplicitParams({
             @ApiImplicitParam(name="id",value = "投保信息ID",required = true,paramType = "query")
     })
-    public MessageResult<InsuranceApplication> insureDetail(String id){
+    public MessageResult<InsuranceApplication> insureDetail(@PathVariable("id") String id){
         MessageResult<InsuranceApplication> msgResult = new MessageResult<>();
 
         try {

picc-common/src/main/resources/mapper/business/InsurancePolicy.xml

@@ -183,7 +183,7 @@
 			) as t
 		]]>
         <where>
-            del_flag=0 and a.no_>1
+            del_flag=0 and no_>1
             <if test="searchParams.companyId != null">
                 and id_ in(
                     select b.policy_id from business_insurance_application a,business_application_policy b