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

935090232@qq.com

2021-01-06 33d82cdff305ce4cb784638edc258b7bb8397353

 zq-erp/src/main/java/com/matrix/system/app/mapper/SysUsersMapper.java

@@ -18,6 +18,8 @@

    @Mapping(source = "suId", target = "id")
    @Mapping(source = "suName", target = "name")
    @Mapping(source = "suPhoto", target = "photo")
    @Mapping(source = "suTel", target = "telphone")
    public abstract BeauticianVo sysUsersToBeauticianVo(SysUsers sysUsers);

    public abstract List<BeauticianVo> usersListToBeautyList(List<SysUsers> list);