Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,794 Commits 2 Branches 292 Tags
c45cc998547597ed4e0d82db33a94de955f85ca4
Commit Graph
1029 Commits
Author SHA1 Message Date
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
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08: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
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
tianshujie 2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00
wangyidong f2cd7c12b4 * code for task #74779. 2022-11-02 14:21:24 +08:00
王怡栋 f03d771f33 Merge branch 'master_bug_28882' into 'master' 
* Fix bug #28882.

See merge request easycorp/zentaopms!5929
 2022-10-28 03:28:35 +00:00
liuhong 67f6c5c346 * Fix bug #28882. 2022-10-28 02:51:28 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
mayue 44f182b305 * Optimize code. 2022-10-26 17:11:59 +08:00
liyuchun 11a4983080 Merge branch 'master' into zenops_46 2022-10-25 11:28:43 +08:00
liyuchun 00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
Yagami d0abde8930 * Code for zentaopms_250 bug. 2022-10-21 17:31:32 +08:00
曾刚 d2771a1dea Bug 28795 2022-10-21 07:59:09 +00:00
Yagami b8f19c5db6 * Fix bug #28592. 2022-10-21 10:16:49 +08:00
Yagami 187d3b8ca4 * Finish task #72674. 2022-10-19 15:36:15 +08:00
Yagami 33bb2e6082 * Finish task #72672. 2022-10-19 10:47:30 +08:00
wangyidong dc45796862 * code for task #72759, #72758. 2022-10-18 13:45:12 +08:00
Yagami b99203caa6 * Finish task #72678. 2022-10-18 11:23:12 +08:00