Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,948 Commits 2 Branches 292 Tags
fd30e0a0062bb94de6cf1dba4af552da316bbc71
Commit Graph
1045 Commits
Author SHA1 Message Date
liuhong 95056fd6cd * draft code task #79667. 2022-12-14 04:09:51 +00:00
xieqiyu 455e7af0da * Code for task#79672. 2022-12-13 17:08:30 +08:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
lanzongjun dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00
lanzongjun 8a0cbc6e6d * Finish Bug #30637 2022-12-09 09:41:06 +08:00
xieqiyu a7b96c881a * Fix bug#30644. 2022-12-08 12:36:50 +08:00
xieqiyu 80af5ddba5 * Finish task#78690. 2022-12-08 10:06:46 +08:00
lanzongjun 29d8ff292a * Finish Task #78697 2022-12-07 15:17:35 +08:00
lanzongjun 55aac8c426 * Finish Task #78664 2022-12-06 16:51:58 +08:00
lanzongjun bc2bceb7a7 * Finish Bug #30543 2022-12-06 09:36:36 +08:00
Yagami 3c60e62afa * Finish task #78692. 2022-12-05 14:03:26 +08:00
lanzongjun 7535a68128 rollback code 2022-12-01 14:07:43 +08:00
lanzongjun 658144ab3a master branch only relation master plan 2022-12-01 14:04:55 +08:00
lanzongjun 315dc16980 master branch only relation master plan 2022-12-01 14:04:26 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
mayue c0879ef983 * Fix bug #30021. 2022-11-23 16:16:06 +08:00
lanzongjun a11d496c0b * Fix Task #77261 2022-11-22 16:55:48 +08:00
lanzongjun 314ab3224a * Fix Task #77261 2022-11-22 16:54:01 +08:00
lanzongjun 1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
lanzongjun 284b748e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-22 15:45:19 +08:00
lanzongjun 740e3e673b * Fix Task #77260 2022-11-22 15:35:34 +08:00
王怡栋 3852627523 * fix bug #29557. 2022-11-21 11:30:59 +08:00
王怡栋 29cddd773a * fix bug #75779. 2022-11-18 16:25:14 +08:00
孙广明 0e8063d20c Merge branch 'master_xieqiyu_29909' into 'master' 
* Fix bug#29909.

See merge request easycorp/zentaopms!6220
 2022-11-17 08:08:49 +00:00
mayue 55947f4fec * Fix bug #29428. 2022-11-17 14:49:32 +08:00
xieqiyu 6039c833a2 * Fix bug#29909. 2022-11-17 11:02:07 +08:00
lanzongjun f7506fa050 * Fix task #76408 2022-11-17 09:23:02 +08:00
xieqiyu 982cc38e5f * Fix bug#29540. 2022-11-16 16:15:26 +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
王怡栋 d3e3335599 * fix bug #29727. 2022-11-16 13:03:50 +08:00
lanzongjun 9e0ac41d78 change story 2022-11-16 11:31:21 +08:00
lanzongjun b18918ad22 * finish task #75921 2022-11-16 09:36:11 +08:00
lanzongjun 2f7e39685c * finish task #75921 2022-11-16 09:34:31 +08:00
王怡栋 60f27fc682 Merge branch 'master_xieqiyu_75905' into 'master' 
* Fix bug#29449.

See merge request easycorp/zentaopms!6145
 2022-11-15 07:38:34 +00:00
lanzongjun 4d4b1565f4 * finish task #75923#75924 2022-11-15 10:23:54 +08:00
lanzongjun e86d77094d * finish task #75904 2022-11-15 09:09:35 +08:00
xieqiyu 92f6e026bb * Fix bug#29449. 2022-11-15 08:36:22 +08:00
lanzongjun 7bb291664c * finish task #75904 2022-11-14 14:44:00 +08:00
xieqiyu 318f8b7b31 * Fix bug#29483. 2022-11-11 01:32:38 +00:00
tanghucheng e09a070318 * Merge branch 'master' into transfer. 2022-11-09 15:44:42 +08:00
xieqiyu b90a9f1742 * Finish task#75322. 2022-11-09 00:46:03 +00:00
王怡栋 ce2eda09f8 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
* finish task #75318#75327#75328

See merge request easycorp/zentaopms!6075
 2022-11-08 07:36:39 +00:00
xieqiyu f76d2abbea * Finish task#75319. 2022-11-08 06:49:57 +00:00
lanzongjun 70fd479801 * finish task #75327 2022-11-08 13:58:34 +08:00
xieqiyu ceaf8a1aa5 * Finish task#75320. 2022-11-08 05:43:34 +00:00
xieqiyu 0ddb613cdc * Finish task#75323. 2022-11-08 03:03:21 +00:00
wangyidong bd18396178 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-08 08:41:50 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie e1ca6e57aa * Fix bug #29361. 2022-11-07 17:21:08 +08:00
tianshujie 2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00