Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,175 Commits 2 Branches 292 Tags
6f150a9ea8a2636767cbf467f29b6b63de2e5083
Commit Graph
1341 Commits
Author SHA1 Message Date
孙广明 11310cee33 * Add approval sql. 2022-05-18 15:07:08 +08:00
zenggang ba542db897 * Finish task#54208 2022-05-18 02:25:43 +00:00
tanghucheng ad9305f120 * Fix bug. 2022-05-16 06:53:14 +00:00
tanghucheng a0bd326f3b * Fix bug. 2022-05-16 06:43:34 +00:00
tanghucheng 0c3eb1a759 * Fix bug for sql. 2022-05-16 02:44:03 +00:00
王怡栋 7dc27f4c95 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* fix bug #22417#22413

See merge request easycorp/zentaopms!3398
 2022-05-13 09:55:23 +00:00
lanzongjun 50487724dc * modify code for sql 2022-05-13 17:53:29 +08:00
王怡栋 3f7611c365 Merge branch 'fixbug' into 'master' 
* Fix bug #22416.

See merge request easycorp/zentaopms!3393
 2022-05-13 09:40:39 +00:00
tanghucheng 8313a0a404 * Fix bug #22416. 2022-05-13 09:33:25 +00:00
lanzongjun 9b1ef72837 * fix bug #22413 2022-05-13 16:23:55 +08:00
lanzongjun 2d4b0ad2b3 * fix bug #22413 2022-05-13 16:23:43 +08:00
lanzongjun 9f1a8e958e * fix bug #22413 2022-05-13 14:59:04 +08:00
lanzongjun 2309a35d86 * fix bug #22417 2022-05-13 14:48:34 +08:00
wangyidong 12b811e4b4 * adjust for workflow field. 2022-05-13 14:19:54 +08:00
tanghucheng 5f34bfe50a * Fix bug #22416. 2022-05-13 05:57:44 +00:00
王怡栋 77d9a77af8 Merge branch 'master' into 'fixbug' 
# Conflicts:
#   db/update16.5.sql
 2022-05-13 03:21:53 +00:00
tanghucheng da9ec2cff1 * Fix bug. 2022-05-13 03:18:32 +00:00
tanghucheng 8ae4c1bcd0 * Fix bug. 2022-05-13 03:15:40 +00:00
tanghucheng 4cf1825350 * Fix bug. 2022-05-13 03:03:33 +00:00
wangyidong c1b12a1104 * code bug #22445. 2022-05-13 10:22:02 +08:00
wangyidong 0a9dca7902 * code bug #22442. 2022-05-13 10:11:36 +08:00
wangyidong 9e49476c2f * code bug #22447. 2022-05-13 10:07:00 +08:00
wangyidong 0e1859becf * code bug #22440. 2022-05-13 09:57:06 +08:00
王怡栋 71354563ea Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
* add method sql

See merge request easycorp/zentaopms!3378
 2022-05-13 01:43:40 +00:00
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
王怡栋 19f37df962 Merge branch 'fixbug' into 'master' 
* Fix bug.

See merge request easycorp/zentaopms!3381
 2022-05-13 01:16:18 +00:00
tanghucheng 5a5f691b37 * Fix bug. 2022-05-13 01:15:30 +00: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