Commit Graph
19 Commits
Author SHA1 Message Date
王怡栋 4a09c0e82c Merge branch 'sgm_fixbug' into 'master'
* Finish task #57904.

See merge request easycorp/zentaopms!4034

(cherry picked from commit 7009548c68)

f5ff0975 * Finish task #57904.
2022-06-21 06:28:33 +00:00
王怡栋 319eda5854 Revert "Merge branch 'sgm_fixbug' into 'master'"
This reverts merge request !4034
2022-06-21 06:25:08 +00:00
孙广明 f5ff0975f8 * Finish task #57904. 2022-06-21 10:50:21 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
tianshujie 5e7034e5c1 * Fix bug #20653. 2022-03-23 14:11:25 +08:00
tianshujie 93076c966b * Fix bug #20766. 2022-03-22 09:03:56 +08:00
zhujinyong 819fad539e * Finish story#31282, story#31284. 2022-03-10 16:21:27 +08:00
liumengyi 04c61d1205 * Fix the bug caused by personnel deletion. 2021-12-23 09:39:37 +08:00
tianshujie 8ea2cc8e9e * Fix bug #17704,17740,17694. 2021-12-21 09:53:44 +08:00
孙广明 53c741481b Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master'
Sprint/179 zhengrunyu fixbug

See merge request easycorp/zentaopms!1020
2021-12-21 00:58:01 +00:00
zhengrunyu d3e873976d *Fix bug 17662. 2021-12-21 08:55:15 +08:00
zhengrunyu 402458803d *Fixbug17662. 2021-12-21 08:54:02 +08:00
zhengrunyu 851f2fad1d *Fix bug 17662. 2021-12-21 08:47:02 +08:00
tianshujie 442fbdad44 * Finish task #46157. 2021-12-20 14:42:06 +08:00
tianshujie ce48a83014 * Add setting button print permission. 2021-12-14 11:25:14 +08:00
tianshujie 5f33672c12 * Modify the save prompt method. 2021-12-14 10:44:31 +08:00
tianshujie 8add043e90 * Modify the code. 2021-12-13 16:06:15 +08:00
tianshujie 6a894bc7fb * Finish task #45829. 2021-12-13 15:37:33 +08:00