7953-devToTest_2438 #2942

Merged
alexm merged 199 commits from 7953-devToTest_2438 into test 2024-09-10 07:22:31 +00:00
2 changed files with 1 additions and 2 deletions
Showing only changes of commit 5c4a30f2f9 - Show all commits

View File

@ -1,5 +1,4 @@
CREATE USER 'vn'@'localhost'; CREATE USER 'vn'@'localhost';
INSERT INTO `ormConfig`(`id`,`selectLimit`) VALUES(1,1000);
GRANT SELECT, GRANT SELECT,
INSERT, INSERT,

View File

@ -136,7 +136,7 @@ module.exports = Self => {
SELECT DISTINCT fp.id, SELECT DISTINCT fp.id,
fp.itemFk, fp.itemFk,
fp.warehouseFk, fp.warehouseFk,
w.name as warehouseName, w.name warehouseName,
fp.rate2, fp.rate2,
fp.rate3, fp.rate3,
fp.started, fp.started,