277 Commits

Include renames

Author	SHA1	Message	Date
tianshujie	17a8e9dcd5	* Changing the name of a function.	2022-07-05 08:47:45 +08:00
tianshujie	21d8a543a4	* Fix bug #24721.	2022-07-04 17:20:35 +08:00
tianshujie	3028701a06	* Finish task #59472.	2022-07-04 17:18:20 +08:00
王怡栋	4bacc1b95f	Merge branch 'sprint/211_liumengyi_59468' into 'master' ... * Finish task #59468. See merge request easycorp/zentaopms!4316	2022-07-04 07:04:37 +00:00
liumengyi	247458ba1e	* Optimize code of task #59468.	2022-07-04 15:03:49 +08:00
王怡栋	04b2a5994f	Merge branch 'sprint/208_tianshujie_58554' into 'master' ... Sprint/208 tianshujie 58554 See merge request easycorp/zentaopms!4317	2022-07-04 06:59:21 +00:00
tianshujie	6fc6d25a48	* Finish task #58554.	2022-07-04 14:48:24 +08:00
tianshujie	3e19862ed1	* Finish task #58554.	2022-07-04 14:12:36 +08:00
tianshujie	ee701c75c9	* Finish task #58554.	2022-07-04 13:20:09 +08:00
liumengyi	7f9f5f662c	* Finish task #59468.	2022-07-04 11:21:56 +08:00
zhouxudong	3970773281	* Fix bug for preview.	2022-06-30 09:08:57 +00:00
zhouxudong	502e3db733	* Iframe and disable will be invalid.	2022-06-30 08:35:22 +00:00
tianshujie	621e382cb6	* Finish task #58554.	2022-06-28 15:35:49 +08:00
zenggang	15feb917ce	* Finish task#58772,58774,58775	2022-06-28 05:39:31 +00:00
mayue	6c975adff8	* Add some code.	2022-06-22 17:21:55 +08:00
tianshujie	c7b1da840f	* Fix bug #56476.	2022-06-07 15:14:24 +08:00
tianshujie	f30883a442	* Delete extra blank lines.	2022-05-25 17:28:44 +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
zenggang	5b623fa3c4	* Finish task#55174	2022-05-25 01:12:37 +00:00
孙华伟	0d132275da	Update recordestimate.js	2022-05-18 07:59:48 +00:00
孙华伟	587bc3c414	*Fix bug #22621.	2022-05-18 14:48:09 +08:00
wangyidong	8aad51ace3	Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms	2022-05-18 10:29:11 +08:00
wangyidong	d6cf08b9d7	Merge branch 'tid'	2022-05-18 10:20:48 +08:00
孙华伟	545dcf550c	*Optimize the code.	2022-05-17 17:28:11 +08:00
孙华伟	3099628ce1	*Optimize the code.	2022-05-17 17:08:27 +08:00
孙华伟	4bc08301f8	*Fix bug #22375	2022-05-17 10:40:11 +08:00
tanghucheng	c04c165276	* Fix bug #21429.	2022-04-28 13:50:48 +08:00
tanghucheng	c96f215ad5	* Fix bug #1780.	2022-04-15 08:08:48 +08:00
zhouxudong	95f8bfa4ee	* Fix bug #12358.	2022-04-14 10:13:56 +08:00
Zongjun Lan	bf35f0e20a	* remove line	2022-04-07 16:18:08 +08:00
Zongjun Lan	e9b834db10	* fix bug #21423	2022-04-07 13:08:21 +08:00
孙广明	1746814316	Merge branch 'sprint/master_zhouxudong_17123' into 'master' ... * Fix bug #17123. See merge request easycorp/zentaopms!2672	2022-03-31 07:18:02 +00:00
zhouxudong	2b69acf643	* Fix bug #17123.	2022-03-31 14:55:04 +08:00
zhouxin	3c1789a534	* Fix bug #21333.	2022-03-31 06:29:45 +00:00
zhouxin	bb47bfa04c	* Fix bug #21333.	2022-03-31 06:02:31 +00:00
zenggang	5ceeb72655	* Finish task#51117	2022-03-30 02:43:34 +00:00
xieqiyu	01a7b6391b	* Fix bug#11308,#20582.	2022-03-29 08:22:45 +08:00
王怡栋	ff30f9fa2f	* adjust for init story for batch create task.	2022-03-22 10:53:26 +08:00
王怡栋	25b0c39dcc	* fix bug #21029.	2022-03-22 10:31:47 +08:00
王怡栋	fe91dc8481	Merge branch 'pailei2'	2022-03-22 09:01:03 +08:00
Zongjun Lan	3d936d7dc8	* fix bug #20703	2022-03-14 15:43:15 +08:00
zhouxin	f470e0d96b	Fix bug #50416.	2022-03-11 06:58:47 +00:00
zhouxin	9f289a632a	Fix bug 50416.	2022-03-11 06:45:03 +00:00
tianshujie	2e3438edfc	* Modify the code.	2022-03-11 14:43:18 +08:00
tianshujie	c353ff2b06	* Fix bug #20594.	2022-03-11 14:38:31 +08:00
tianshujie	ffd4850a9d	* Finish task #20479.	2022-03-09 16:17:32 +08:00
孙广明	4c218d7a69	Merge branch 'pailei_zhangzilong_49888' into 'pailei2' ... Pailei zhangzilong 49888 See merge request easycorp/zentaopms!2155	2022-03-09 06:41:53 +00:00
xieqiyu	139ea1e04a	* Modify review code.	2022-03-09 11:17:36 +08:00
zhangzilong	6327b37eae	* Code for task #49888.	2022-03-09 10:41:46 +08:00