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

# Conflicts:
#	pz-system/src/main/java/com/pz/merchant/service/IEmployeesService.java
#	pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

pz-system/src/main/java/com/pz/merchant/service/IEmployeesService.java

@@ -68,7 +68,6 @@ public interface IEmployeesService {
      * @return
      */
     Boolean updateByApp(EmployeesBo bo);
-
     /**
      * 校验并批量删除陪诊员信息
      */

pz-system/src/main/java/com/pz/merchant/service/impl/EmployeesServiceImpl.java

@@ -197,6 +197,7 @@ public class EmployeesServiceImpl implements IEmployeesService {
         validEntityBeforeSave(update);
         return baseMapper.updateById(update) > 0;
     }
+
     /**
      * 需求广场
      *