Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
39,903 Commits 2 Branches 292 Tags
687f29b7bca17e4bc06c95e6155d5bcf984c3d06
Commit Graph
1370 Commits
Author SHA1 Message Date
lanzongjun c25d199878 * finish bug #23282 2022-06-06 14:20:34 +08:00
lanzongjun 89bf907dff * finish bug #23282 2022-06-06 14:16:38 +08:00
zhujinyong 9f322ef866 * Renew apis. 2022-06-06 08:53:54 +08:00
hufangzhou b4fd618491 * Add the new version. 2022-06-02 09:10:04 +08:00
hufangzhou 44f99c26a5 * Modify the xuan upgrade sql. 2022-05-31 15:18:57 +08:00
hufangzhou 27ec156f88 * Add the new version. 2022-05-26 09:52:33 +08:00
wangyidong 5c1e2c160d * adjust for flow. 2022-05-26 09:01:58 +08:00
wangyidong 2decbcc7c5 * adjust for flow. 2022-05-26 09:00:41 +08:00
wangyidong 3159eb540a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-05-25 16:39:53 +08:00
wangyidong ddb25449d2 * code for task #54955. 2022-05-25 16:38:38 +08:00
李玉春 b41cdeb6f4 Merge branch 'sprint/194_tianshujie_55257' into 'master' 
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
 2022-05-25 08:08:26 +00:00
tianshujie e3d1c44eae * Finish task #55257. 2022-05-25 13:45:10 +08:00
李玉春 b5ad70bcb7 Merge branch 'master' into 'sgm_sprint195' 
# Conflicts:
#   db/update17.0.beta1.sql
 2022-05-24 06:58:00 +00:00
孙广明 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