Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
47,956 Commits 2 Branches 292 Tags
e60b21e1b6cde88d1ed4925a2cc94916075fa0ec
Commit Graph
1010 Commits
Author SHA1 Message Date
caoyanyi e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +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
chaideqing e50dbc5be3 * code review 2022-10-18 09:39:39 +08:00
sunguangming e63026ddc5 * Fix bug #28471. 2022-10-17 09:10:18 +08:00
sunguangming c5c22f0e3d * Fix bug #28492. 2022-10-17 08:54:14 +08:00
chaideqing 361040cc94 * refactor ->loadModel('bug')->lang to ->app->loadLang('bug') 2022-10-14 09:19:28 +08:00
王怡栋 900f1f42dc Merge branch 'feedback_1077' into 'master' 
* Code for feedback #1077

See merge request easycorp/zentaopms!5743
 2022-10-14 00:41:43 +00:00
zenggang fa83b54f4d * Code for feedback #1077 2022-10-12 08:56:08 +00:00
chaideqing 7dd705342c * fix No bug-lang in open source version 2022-10-12 15:34:48 +08:00
王怡栋 abcdde7ea3 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239' 
* Fix systemMode bug.

See merge request easycorp/zentaopms!5710
 2022-10-10 09:18:50 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
sunguangming 541b100471 * Fix bug #28339,#28326. 2022-10-10 13:21:39 +08:00
leiyong bd612c2e64 * Merge code. 2022-10-10 01:28:39 +00:00
sunguangming 55de5d362b * Fix bug #28293. 2022-10-09 15:33:33 +08:00
sunguangming 86409982fd * Fix bug #28292. 2022-10-09 13:17:40 +08:00
liyuchun 41bddc2893 Merge branch 'master' into zenops_46 2022-10-08 15:22:35 +08:00
liugang 55483c6fcb * Fix bug #27611. 2022-10-08 10:50:11 +08:00
sunguangming 22955353b1 * Fix bug #28249. 2022-10-08 10:39:06 +08:00
hufangzhou 90e28b35c2 * Fix bug #28266. 2022-10-08 01:24:57 +00:00
hufangzhou 098ad81cd5 * Handle feedback #130. 2022-09-30 15:11:57 +08:00
曹延义 0afdc68654 Merge branch 'master' into zenops_46 2022-09-30 15:07:37 +08:00