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
1110 Commits
Author SHA1 Message Date
孙华伟 b59fb9cc1c *Fix bug#22616. 2022-05-18 13:43:48 +08:00
liumengyi 2f8e2e03e3 * Finish task #54336. 2022-05-18 08:54:40 +08:00
孙广明 268d3c3bcf * Finish task #54218. 2022-05-17 16:04:39 +08:00
孙广明 270715e54b Merge branch 'sprint_sunjun_631' into 'master' 
Sprint sunjun 631

See merge request easycorp/zentaopms!3410
 2022-05-17 01:15:01 +00:00
sunjun 7e9466abbd sprint_sunjun_631 2022-05-16 21:08:04 +08:00
zhouxudong 53102c368e * Fix bug #22441. 2022-05-16 03:28:40 +00:00
sunjun 073ee90d40 sprint_sunjun_631 2022-05-16 11:10:20 +08:00
zhouxudong a5783fa37c * Fix bug #22441. 2022-05-16 01:55:08 +00:00
zhouxudong d1d05a067e * Fix bug #22441. 2022-05-16 01:38:43 +00:00
sunjun d26e9a0c94 sprint_sunjun_631 2022-05-16 09:13:55 +08:00
sunjun 249190e049 sprint_sunjun_631 2022-05-16 09:11:50 +08:00
sunjun a4f026d786 sprint_sunjun_631 2022-05-16 09:08:47 +08:00
xieqiyu 8c50568213 * Restore the code of task#53671. 2022-05-15 21:28:31 +08:00
sunjun f5fe24b54f sprint_sunjun_631 2022-05-15 12:47:45 +08:00
sunjun 4863551658 sprint_sunjun_631 2022-05-14 21:06:48 +08:00
sunjun 9ad4d27dc4 sprint_sunjun_631 2022-05-14 20:32:54 +08:00
sunjun e9aab00257 sprint_sunjun_631 2022-05-14 19:39:22 +08:00
sunjun 730561654f sprint_sunjun_631 2022-05-13 05:41:39 +00:00
sunjun 845c84a1eb *sprint_sunjun_631 2022-05-13 02:53:47 +00:00
xieqiyu 89491d97de * Resolve issue#629. 2022-05-13 03:02:26 +08:00
xieqiyu 914f474592 * Code for task#53666. 2022-05-12 22:58:17 +08:00
王怡栋 a9d13faa1a Merge branch 'master' into 'sprint/189_zhouxudong_53651' 
# Conflicts:
#   module/execution/js/edit.js
 2022-05-12 05:20:13 +00:00
王怡栋 5674160b7e Merge branch 'master_xieqiyu_53666' into 'master' 
Master xieqiyu 53666

See merge request easycorp/zentaopms!3353
 2022-05-12 05:05:25 +00:00
zhouxudong f98d82234a * Finish task #53651. 2022-05-12 03:57:23 +00:00
zhouxudong 65fff67e58 * finish task #53651. 2022-05-12 00:30:00 +00:00
xieqiyu 612a2b656e * Adjust code style. 2022-05-12 00:18:05 +08:00
xieqiyu dab8c1bb1e * Modify review code. 2022-05-12 10:55:50 +08:00
xieqiyu ffa1ec828d * Code for task#53661. 2022-05-12 10:38:22 +08:00
xieqiyu 691de86d4a * Code for task#53661. 2022-05-12 08:15:25 +08:00
xieqiyu ce7c0afdc1 * Finish task#53666. 2022-05-11 18:24:13 +08:00
zhouxudong a0f2b068dc * Fix bug #22339. 2022-05-11 08:51:36 +00:00
zhouxudong 675d2c2e86 * Fix bug #22339. 2022-05-11 08:49:22 +00:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
孙广明 622185aa65 Merge branch 'sprint/189_zhouxudong_53651' into 'master' 
Sprint/189 zhouxudong 53651

See merge request easycorp/zentaopms!3323
 2022-05-11 05:51:12 +00:00
zhouxudong ca827e1d6c * Finish task #53651. 2022-05-11 05:32:48 +00:00
王怡栋 82968630b0 Merge branch 'master_xieqiyu_53671' into 'master' 
Master xieqiyu 53671

See merge request easycorp/zentaopms!3322
 2022-05-11 05:17:05 +00:00
zhouxudong da5cd2aa44 * Finish task #53651. 2022-05-11 03:02:28 +00:00
xieqiyu c77a6505d3 * Finish task#53671. 2022-05-11 09:01:17 +08:00
zhouxudong 1723a78c92 * Finish task #53651. 2022-05-10 09:11:06 +00:00
孙广明 e6ba9acf68 Merge branch 'sprint/tianshujie_task53668' into 'master' 
Sprint/tianshujie task53668

See merge request easycorp/zentaopms!3310
 2022-05-10 09:09:34 +00:00
tianshujie 5bdb7f521c * Finish task #53668. 2022-05-10 17:05:49 +08:00
sunjun 631601a39b sprint_sunjun_53665 2022-05-10 06:42:34 +00:00
tianshujie 5c00aa823c * Modify language item error. 2022-05-10 11:24:17 +08:00
liyuchun 81903f2fe5 * Fix bug #15563. 2022-04-28 06:05:39 +00:00
tanghucheng c781eadd94 * Fix bug. 2022-04-27 17:28:08 +08:00
tanghucheng f4666d8384 * Fix bug #15677. 2022-04-27 14:21:00 +08:00
lanzongjun 68270a031b * fix bug #15834 2022-04-26 10:50:44 +08:00
tanghucheng 76c0462119 * Fix bug #21439. 2022-04-24 01:53:07 +00:00
Zongjun Lan c6678ed77b * fix bug undefined from 2022-04-22 14:16:08 +08:00