Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
50,423 Commits 2 Branches 292 Tags
f5e68c045e2b18d271a75e80bd7c79f6607847b3
Commit Graph
1387 Commits
Author SHA1 Message Date
xieqiyu f5e68c045e * Fix bug#31708. 2023-01-17 10:00:03 +08:00
孙广明 9554414096 Merge branch 'master_bug_27671' into 'master' 
* Fix bug #27671.

See merge request easycorp/zentaopms!6766
 2023-01-13 08:35:07 +00:00
liuhong 2b48e98222 * Fix bug #27671. 2023-01-13 06:47:07 +00:00
liuhong fe80314c6a * Fix bug #30816. 2023-01-13 03:29:21 +00:00
daitingting 40f8690b60 * Finish task #82075. 2023-01-08 02:29:13 +00:00
daitingting 80cce4e580 * Finish task #82075. 2023-01-04 08:08:38 +00:00
xieqiyu bb0c7167c9 * Code for task#81187. 2022-12-28 14:20:57 +08:00
xieqiyu 260e043338 * Code for task#81187. 2022-12-28 13:40:27 +08:00
xieqiyu 61e41379be * Fix bug#30583. 2022-12-16 14:23:21 +08:00
xieqiyu 5c34348cd9 * Fix bug#30901. 2022-12-15 16:18:18 +08:00
孙广明 2a2ea5e9b0 * Remove unused code. 2022-12-15 15:33:15 +08:00
孙广明 4a718900d2 * Fix bug #30870. 2022-12-15 10:05:16 +08:00
孙广明 0d1495522b * Finish task #79446. 2022-12-15 09:57:19 +08:00
孙广明 4b14d842d2 * Finish task #79447. 2022-12-14 14:39:41 +08:00
孙广明 b654a1f43d Merge branch 'sprint/zentaopms271_lanzongjun' into 'master' 
* Finish Task #79665#79466

See merge request easycorp/zentaopms!6542
 2022-12-14 06:15:04 +00:00
孙广明 c8fbb5633c Merge branch 'master_xieqiyu_79668' into 'master' 
Master xieqiyu 79668

See merge request easycorp/zentaopms!6544
 2022-12-14 06:14:49 +00:00
lanzongjun 34a1ff3518 * Finish Task #79466 2022-12-14 10:50:41 +08:00
lanzongjun 9f3e8eb09f * Finish Task #$plan->branch 2022-12-14 10:28:59 +08:00
孙广明 6f584ec3c1 Merge branch 'sprint_273_79669' into 'master' 
Sprint 273 79669

See merge request easycorp/zentaopms!6534
 2022-12-14 01:33:28 +00:00
xieqiyu 8ac26c73c3 * Code for task#79668. 2022-12-13 22:05:32 +08:00
liuhong c215624d2a * Adjust code for task #79669. 2022-12-13 07:23:27 +00:00
liuhong 0e9304bff4 * Fix task #79669. 2022-12-13 06:38:10 +00:00
liuhong 093826a152 * Adjust code task #79669. 2022-12-13 05:13:22 +00:00
liuhong 553a684afe * Finish task #79669. 2022-12-13 03:10:25 +00:00
lanzongjun 493910031a * Finish Task #79466 2022-12-13 09:45:01 +08:00
lanzongjun 295bfadc5b * Finish Task #79671 2022-12-12 15:38:55 +08:00
liuhong 4cf85d5ed7 * Fix task #79669. 2022-12-12 07:17:47 +00:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
zenggang 3d676b613a * Fix bug#30719 2022-12-09 00:59:17 +00:00
xieqiyu a7b96c881a * Fix bug#30644. 2022-12-08 12:36:50 +08:00
lanzongjun 0adbd8e27a * Finish Bug #30541 2022-12-06 10:16:34 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
lanzongjun 1651a1492e edit story fix empty 2022-12-01 14:23:31 +08:00
lanzongjun b1831623e5 * Finish Task #77806 2022-11-30 15:16:44 +08:00
liuyongkai 9455b09e17 * Resolve feedback #1459. 2022-11-28 14:55:02 +08:00
liuyongkai 64fb4c10ca * Resolve feedback #1459. 2022-11-28 14:15:58 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
mayue fc4abe395d * Fix bug #30096. 2022-11-24 16:10:19 +08:00
xieqiyu 37122bb5a8 * Fix bug#30056. 2022-11-23 09:34:21 +08:00
王怡栋 3852627523 * fix bug #29557. 2022-11-21 11:30:59 +08:00
xieqiyu df629b33bf * Fix bug#29940. 2022-11-17 11:08:59 +08:00
王怡栋 9e0c3de9da Merge branch 'sprint/master_lanzongjun_fixbug' into 'master' 
change story

See merge request easycorp/zentaopms!6188
 2022-11-16 07:26:11 +00:00
王怡栋 2bb3cd3371 Merge branch 'fixbug' 2022-11-16 13:08:00 +08:00
lanzongjun 9e0ac41d78 change story 2022-11-16 11:31:21 +08:00
tanghucheng 3ce0869e1a * Replace '' to helper::dbIN for release linkStory. 2022-11-16 11:28:40 +08:00
tanghucheng 47398d1cf0 * Fix bug #29869. 2022-11-16 10:52:53 +08:00
lanzongjun 72c38e942e add param 2022-11-15 13:39:09 +08:00
lanzongjun 4d4b1565f4 * finish task #75923#75924 2022-11-15 10:23:54 +08:00
lanzongjun c512ab0d73 * finish task #75912 2022-11-14 17:06:33 +08:00
lanzongjun 991253d2a8 remove code 2022-11-14 14:48:18 +08:00