Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
41,478 Commits 2 Branches 292 Tags
4d16cbf4dc9f8fbcbdfc462594de6d3d825e5a39
Commit Graph
1407 Commits
Author SHA1 Message Date
孙广明 fb61022d2c * Add sql for issue. 2022-05-24 14:56:53 +08:00
李玉春 ffb7904cee Merge branch 'sprint/194_liumengyi_activeKanban' into 'master' 
* Finish task #55255.

See merge request easycorp/zentaopms!3556
 2022-05-24 05:38:09 +00:00
liumengyi 8ff63b2215 * Fix bug for task #55255. 2022-05-24 13:15:07 +08:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
wangyidong 99f1170ca7 * cahnge can search for workflow. 2022-05-20 11:38:23 +08:00
tanghucheng 868bc4c7e0 * Fix bug. 2022-05-19 09:34:12 +00:00
zhujinyong e07457cd29 * Update16.5. 2022-05-19 16:28:45 +08:00
zhujinyong e71094decc * Fix code style. 2022-05-19 15:56:19 +08:00
zhujinyong 6f46cbfb0c * Add approval sql. 2022-05-19 15:52:41 +08:00
wangyidong 13202156b3 * fix bug #22631. 2022-05-18 15:18:40 +08:00
孙广明 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
wangyidong 415d9ed538 * adjust for merge master code. 2022-05-17 17:12:12 +08:00
wangyidong f9b06ea3f9 * adjust for workflow field name. 2022-05-17 13:50:20 +08:00
wangyidong b86fb91604 * adjust for storyClosedReason field. 2022-05-17 10:53:43 +08:00
wangyidong f1702375c1 * adjust for action position field. 2022-05-16 15:29:25 +08:00
王怡栋 cdd560f7ba Merge branch 'sprint/189_package' into 'devplat16_wangyidong_54037' 
# Conflicts:
#   db/update16.5.sql
 2022-05-16 07:23:27 +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
wangyidong d2f84bb3f6 * code for task #54037. 2022-05-16 13:37:06 +08: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