Merge branch 'dev' of https://git.verdnatura.es/salix into dev
This commit is contained in:
commit
9b2df51d29
|
@ -47,7 +47,6 @@ module.exports = Self => {
|
||||||
where: {'u.active': true}
|
where: {'u.active': true}
|
||||||
};
|
};
|
||||||
|
|
||||||
console.log(filter.where);
|
|
||||||
myFilter = mergeFilters(myFilter, clientFilter);
|
myFilter = mergeFilters(myFilter, clientFilter);
|
||||||
|
|
||||||
let stmt = new ParameterizedSQL(
|
let stmt = new ParameterizedSQL(
|
||||||
|
|
Loading…
Reference in New Issue