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

src/main/resources/mapper/modules/scheme/PtlOptionalSchemeInsuranceMapper.xml

@@ -33,6 +33,7 @@
             WHERE pos.company_id = #{param.companyId} and pos.product_id = #{param.productId}
                 and
             pos.vehicle_type = #{param.vehicleType} and pos.energy_type = #{param.energyType}
+            and pos.carnature = #{param.carnature}
         order by ibio.sort
     </select>