122 Commits

Include renames

Author	SHA1	Message	Date
tianshujie	16251869b4	* Modify the SQL statement linked to the query story plan.	2021-11-11 09:10:38 +08:00
tianshujie	9e622a2995	* Merge conflicts.	2021-11-09 16:27:06 +08:00
李玉春	98f519fe31	Merge branch 'sprint/170' into 'sprint/170_tianshujie_43901' ... # Conflicts: # module/branch/model.php # module/story/model.php	2021-11-09 07:53:17 +00:00
tianshujie	8e9dd74c0d	* Modify code logic.	2021-11-09 15:47:31 +08:00
tianshujie	5ab6fe77c2	* Modify code logic.	2021-11-09 14:21:17 +08:00
tianshujie	3986d8c297	* Add the logic of project-related multi-branch products.	2021-11-09 10:04:05 +08:00
tianshujie	0328182a47	* Modify the logic of the acquisition plan.	2021-11-05 17:19:41 +08:00
tianshujie	77da777064	* Finish task #43893.	2021-11-05 15:46:52 +08:00
hufangzhou	af5b6ff489	* Finish task #43899.	2021-11-04 11:48:22 +08:00
zhouxin	4f1126ada7	Finish task #43617.	2021-10-29 11:28:41 +08:00
tianshujie	d6cea498cd	* Finish task #43206.	2021-10-12 10:33:07 +08:00
王怡栋	26ee9677ce	* finish task #42394.	2021-09-08 13:04:27 +08:00
王怡栋	6f3a39f334	* fix for pager for browse plan.	2021-08-24 17:37:26 +08:00
wangyidong	3bfa1df846	* fix bug #13954.	2021-07-30 10:48:14 +08:00
holan20180123	7535cfe35f	* Fix bug #12406.	2021-04-27 10:54:34 +08:00
wangyidong	f563acb640	* adjust code.	2021-04-26 10:31:52 +08:00
holan20180123	dca05f8be2	* Finish task #8226.	2020-11-09 09:53:18 +08:00
tianshujie98	11d81b4ef1	* Edit comment.	2020-10-12 11:24:06 +08:00
holan20180123	02eb03583d	* Finish task #8085.	2020-10-10 16:56:36 +08:00
tianshujie98	1ef4203498	* Finish task #8077.	2020-09-30 15:43:56 +08:00
tianshujie98	80dfeda677	* Adjust code style.	2020-09-16 15:01:20 +08:00
tianshujie98	a9013adc4e	* Finish task #7994.	2020-09-16 14:55:30 +08:00
z	6aca289707	* finish task #7585.	2020-08-06 15:28:46 +08:00
shilei	8a9ece9db2	[bug修复]当计划绑定多个项目时，计划列表显示的总条数(recTotal)不正确，需进行去重处理	2019-11-29 16:16:40 +08:00
wangyidong	d2c577c6f6	* fix get plan list when product is null.	2019-09-04 08:51:23 +08:00
wangyidong	d29ac3a948	* code for task #6288.	2019-09-02 09:12:17 +08:00
wangyidong	253e0ab3a8	* finish task #6231.	2019-08-21 15:32:29 +08:00
jinianlan	b69e070b59	* fix Bug 2654	2019-08-02 18:36:43 +08:00
wangyidong	b309c4a9c7	* adjust for children plan.	2019-02-19 11:25:50 +08:00
wangyidong	ab68c71dfb	* fix bug.	2019-02-14 17:17:15 +08:00
wangyidong	deade1f213	* fix bug.	2019-02-14 16:53:30 +08:00
wangyidong	a59f56c86e	* code for task #7312.	2019-02-14 11:28:25 +08:00
wangyidong	7481bb097c	* finish task #7312.	2019-02-13 16:55:50 +08:00
wangyidong	bdde42e761	* finish task #7311.	2019-02-13 16:13:25 +08:00
wangyidong	40c92e7648	* finish task #4686.	2018-08-08 10:21:35 +08:00
liugang	330d108f57	* Finish task #4637.	2018-07-05 13:56:37 +08:00
daitingting	537699060f	* Adjust codes.	2018-07-03 16:26:44 +08:00
estellbright	538b7c65a3	* Fix Bug #1538 #1539.	2018-04-27 11:00:24 +08:00
JackWuLieHao	d50de9fd8f	* Finish task 3797	2018-04-04 16:46:24 +08:00
JackWuLieHao	e5b822276d	* Finish bug #1486 #1502	2018-04-04 14:35:09 +08:00
daitingting	a474597c66	Merge branch 'zentaopms_9.8' of https://github.com/easysoft/zentaopms into zentaopms_9.8	2018-03-22 15:43:25 +08:00
daitingting	867849c254	* Optimize future function for productplan.	2018-03-22 15:42:57 +08:00
wangyidong	ad1a24089d	* code for plan getpairs with unexpired.	2018-03-22 15:00:55 +08:00
daitingting	de741a4c68	* Get last productplan without future.	2018-03-20 17:24:56 +08:00
daitingting	e20ad46810	* Set begin and end is future when click future button.	2018-03-16 15:31:22 +08:00
wangyidong	8d64b4c9eb	* change for 9.8.1 version.	2018-03-13 11:29:28 +08:00
滔哥	1177206405	* Finish Task#3551.	2018-01-10 17:29:30 +08:00
滔哥	70f18180d2	* Task#3576	2018-01-10 08:33:18 +08:00
滔哥	1eee375a7f	* Finish task#3551	2018-01-05 11:08:00 +08:00
滔哥	a92a0bdb29	* Finish task#3553	2018-01-03 22:06:04 +08:00