Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
49,608 Commits 2 Branches 292 Tags
49cb8a7bcb837fee020e4e77d58aed7fb5846e50
Commit Graph
1069 Commits
Author SHA1 Message Date
caoyanyi 71bc8ac80a Merge branch 'master' into zenops_46 2022-12-21 13:56:27 +08:00
wangyidong 164cca5ffe * code task #80451. 2022-12-21 10:31:46 +08:00
tanghucheng 5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
xieqiyu af8cf547ea * Fix bug#30855. 2022-12-16 14:52:42 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
xieqiyu 25a1ed7fd0 * Fix bug#30844. 2022-12-15 10:36:25 +08: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
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +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
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +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
caoyanyi b40d86d219 Merge branch 'master' into zenops_46 2022-11-17 14:42:05 +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
caoyanyi e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +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
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +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