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

mall-server-api/src/main/java/com/gree/mall/manager/zfire/bean/WorkerParamBean.java

@@ -11,4 +11,6 @@ public class WorkerParamBean extends ZfireParamBean {
     @ApiModelProperty(value = "是否按师傅编号分组")
     private Boolean isGroupByWorkerId = Boolean.FALSE;
 
+    @ApiModelProperty(value = "是否检查师傅证件")
+    private Boolean checkCert = Boolean.FALSE;
 }

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -99,6 +99,9 @@
                 #{item}
             </foreach>
         </if>
+        <if test="ex.checkCert != null and ex.checkCert == true">
+            AND b.examine_status IN ('OK', 'EXPIRED')
+        </if>
         and a.apply_type='WORKER'
         <if test="ex.isGroupByWorkerId != null and ex.isGroupByWorkerId == true">
             GROUP BY a.worker_number