Commit Graph
1315 Commits
Author SHA1 Message Date
lanzongjun 3cf3682e41 * modify error sql 2022-05-13 09:27:12 +08:00
lanzongjun 7f93dcd1c4 * add method sql 2022-05-13 09:23:00 +08:00
lanzongjun 4a5c3a2f0e * add method sql 2022-05-13 08:48:19 +08:00
wangyidong 7336b0dabb * code for task #53928. 2022-05-12 18:56:26 +08:00
王怡栋 c116f9a9d1 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3372
2022-05-12 09:10:50 +00:00
王怡栋 a47a3ad064 Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-12 09:09:28 +00:00
lanzongjun 24a67405db * add sql 2022-05-12 17:07:58 +08:00
lanzongjun 63bd7e6902 * add sql 2022-05-12 17:04:55 +08:00
唐胡成 719db9f013 Update update16.5.sql 2022-05-12 08:49:01 +00:00
tanghucheng 36d4e294e7 * Fix bug. 2022-05-12 08:46:51 +00:00
王怡栋 7a15492b56 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3364
2022-05-12 07:56:03 +00:00
tanghucheng 4be4e591c5 * Fix bug. 2022-05-12 07:22:39 +00:00
lanzongjun 8d978d4295 * add sql 2022-05-12 13:18:22 +08:00
lanzongjun 921ef0b7cf * add sql 2022-05-12 10:00:02 +08:00
lanzongjun e026472d00 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-05-12 09:10:37 +08:00
王怡栋 d11a0831f8 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3345
2022-05-12 01:07:16 +00:00
孙华伟 2eddac20a1 Update update16.5.sql 2022-05-11 09:36:56 +00:00
孙华伟 1f72825b20 Update update16.5.sql 2022-05-11 09:36:27 +00:00
tanghucheng 214259dfc0 * Fix bug. 2022-05-11 09:23:03 +00:00
tanghucheng db265cabf6 * Finish task #53590. 2022-05-11 06:53:19 +00:00
tanghucheng 9b5e2ab953 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug 2022-05-11 05:48:27 +00:00
tanghucheng aa1fa22987 * Code for feeedback workflow. 2022-05-11 05:47:49 +00:00
wangyidong 828fddb8b7 * code for task #53589. 2022-05-11 13:02:08 +08:00
lanzongjun 7faef1af2e * fix task #53588 2022-05-11 11:27:28 +08:00
王怡栋 72584ceb38 Merge branch 'master' into 'fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-11 03:26:01 +00:00
tanghucheng f3f0dd5647 * Code for task #53591. 2022-05-11 03:16:41 +00:00
lanzongjun 2f060c927b * fix task #53588 2022-05-11 11:00:19 +08:00
lanzongjun fc36941647 * fix task #53588 2022-05-11 10:58:57 +08:00
王怡栋 561b0bdbf1 Merge branch 'master' into 'fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-10 09:12:01 +00:00
王怡栋 e96bea3c6c Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-10 09:05:19 +00:00
lanzongjun f4c8db7ed8 * fix task #53591 2022-05-10 17:02:03 +08:00
tanghucheng 9712ddcea9 Merge branch 'fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into fixbug 2022-05-10 08:54:22 +00:00
tanghucheng bd06901bfa * Fix bug. 2022-05-10 08:52:05 +00:00
唐胡成 82652aca0c Merge branch 'master' into 'fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-10 07:49:43 +00:00
lanzongjun 1b5b443174 * fix task #53591 2022-05-10 15:28:18 +08:00
tanghucheng fe927b1e5e * Finish task #53593. 2022-05-10 06:27:22 +00:00
wangyidong c9bc2ba86f * code for task #53592. 2022-05-10 13:48:37 +08:00
hufangzhou 90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
tianshujie 6687fcdd46 * Fix bug #13146. 2022-04-27 10:48:33 +08:00
liyuchun 4c031465dc * Fix bug #22005. 2022-04-26 07:38:12 +00:00
hufangzhou 961e46d820 * Fix bug #17446. 2022-04-24 10:20:35 +08:00
田淑杰 4588b9c103 * Modify the sql statement. 2022-04-22 10:07:42 +08:00
Zongjun Lan 3b61e47ad8 * fix bug update sql 2022-04-21 14:40:33 +08:00
Zongjun Lan e2def6e71b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-21 10:13:48 +08:00
Zongjun Lan 473d5a6566 * fix bug #21853 2022-04-21 10:13:39 +08:00
tianshujie 0c55baddc6 * Fix bug #21858. 2022-04-20 10:57:00 +08:00
王怡栋 6fdd522363 * fix for sql. 2022-04-19 16:11:26 +08:00
王怡栋 a4c8a5334e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-19 15:13:01 +08:00
王怡栋 657a8f50ef * fix bug for sql. 2022-04-19 15:12:31 +08:00
xieqiyu 205e3126ad * Fix bug#19379. 2022-04-18 15:09:49 +08:00