Merge remote-tracking branch 'origin/master'

sdjk-service/src/main/java/com/miaxis/question/domain/QuestionInfo.java

@@ -248,6 +248,11 @@ public class QuestionInfo extends BaseBusinessEntity {
     @ApiModelProperty(value = "是否新规 0否 1是")
     private Integer isNew;
 
+    /** 错误率 */
+    @Excel(name = "错误率")
+    @TableField("error_rate")
+    @ApiModelProperty(value = "是否新规 0否 1是")
+    private Double errorRate;
 
 
 }

sdjk-service/src/main/resources/mapper/question/QuestionInfoMapper.xml

@@ -153,7 +153,6 @@
             <if test="liceBus != null  and liceBus != ''"> and lice_bus = #{liceBus}</if>
             <if test="liceTruck != null  and liceTruck != ''"> and lice_truck = #{liceTruck}</if>
             <if test="liceMoto != null  and liceMoto != ''"> and lice_moto = #{liceMoto}</if>
-            <if test="isNew != null "> and is_new = #{isNew}</if>
         </where>
         ORDER BY
         excell_issue + 0 ASC