Commit Graph
51749 Commits
Author SHA1 Message Date
王怡栋 23d4e4d11e Merge branch 'daitingting_bug_#32503' into 'master'
* Fix bug #32503.

See merge request easycorp/zentaopms!7094
2023-03-01 00:31:59 +00:00
王怡栋 079e301cbc Merge branch 'cyy_optimize' into 'master'
* Optimize page style for guide block.

See merge request easycorp/zentaopms!7093
2023-03-01 00:31:40 +00:00
王怡栋 edadf35e67 Merge branch 'zenops_task_85166' into 'master'
* Finish task#85166,85171

See merge request easycorp/zentaopms!7091
2023-03-01 00:31:10 +00:00
王怡栋 97feb59658 Merge branch 'master_xieqiyu_28400' into 'master'
* Code for bug#28400.

See merge request easycorp/zentaopms!7090
2023-03-01 00:30:04 +00:00
王怡栋 89aa616e4d Merge branch 'sprint/hufangzhou_changelog' into 'master'
* Add the biz and max changelog.

See merge request easycorp/zentaopms!7085
2023-03-01 00:29:37 +00:00
caoyanyi b10b4de7cb * Modify tutorial checked. 2023-02-28 17:15:40 +08:00
孙广明 c9a7c22553 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Fix bug 32493 32502 32495 32494 32491.

See merge request easycorp/zentaopms!7092
2023-02-28 09:12:43 +00:00
Yagami 1efa245724 * Code for program progress bug. 2023-02-28 17:10:36 +08:00
liumengyi 241c923453 * Fix bug #32491. 2023-02-28 08:55:37 +00:00
liumengyi 1c3131e402 * Fix bug #32494. 2023-02-28 08:41:30 +00:00
daitingting 2271e5bd70 * Fix bug #32503. 2023-02-28 08:38:00 +00:00
Yagami 7ca8fbffb4 * Fix code error. 2023-02-28 16:22:59 +08:00
caoyanyi 569efba6e0 * Optimize page style for guide block. 2023-02-28 16:14:58 +08:00
liumengyi 2fd93bcb08 * Fix bug #32495. 2023-02-28 08:14:08 +00:00
liumengyi adba207640 * Fix bug #32502. 2023-02-28 08:07:03 +00:00
liumengyi 1c5578745b * Fix bug #32493. 2023-02-28 07:56:21 +00:00
zenggang c2815a2605 * Fix task#85166,85171 2023-02-28 07:32:22 +00:00
Yagami 626b5f3abf Merge branch 'sprint/294_liumengyi_fixbug' 2023-02-28 15:17:01 +08:00
孙广明 cde3ff49f3 Merge branch 'master' into 'sprint/294_liumengyi_fixbug'
# Conflicts:
#   module/project/js/execution.js
2023-02-28 07:16:39 +00:00
孙广明 54c3641625 Merge branch 'fixbug_liumengyi' into 'master'
* Optimize code, fix bug 32456 32457 32463 32464 32477 32480.

See merge request easycorp/zentaopms!7086
2023-02-28 07:15:20 +00:00
liumengyi 9f665d39c0 * Fix bug #32485. 2023-02-28 06:36:09 +00:00
xieqiyu 23518e36fd * Code for bug#32489. 2023-02-28 14:33:43 +08:00
liumengyi e96d7b0e00 * Fix bug #32455. 2023-02-28 06:25:07 +00:00
Yagami 0f38f55480 * Fix bug #32450. 2023-02-28 14:22:49 +08:00
Yagami abc8bf2788 * Fix bug #32450. 2023-02-28 14:16:29 +08:00
liumengyi cf7fda21fd * Fix bug #32484. 2023-02-28 06:12:49 +00:00
xieqiyu a028eaea16 * Code for bug#28400. 2023-02-28 14:11:52 +08:00
liumengyi 5daf06d2f1 * Fix bug #32480. 2023-02-28 06:03:03 +00:00
孙广明 6b78218b41 Merge branch 'tsj_fixbug' into 'master'
* Code for fix bug #32473.

See merge request easycorp/zentaopms!7088
2023-02-28 05:58:02 +00:00
tianshujie f0ff736880 * Code for fix bug #32473. 2023-02-28 13:55:12 +08:00
liumengyi cbed975b74 * Fix bug #32477, and fix bug of change parent stage. 2023-02-28 05:44:39 +00:00
孙广明 86a113c8ec Merge branch 'tsj_ui' into 'master'
Tsj ui

See merge request easycorp/zentaopms!7084
2023-02-28 05:29:37 +00:00
caoyanyi d6fe7e5e79 * Fix bug #32453. 2023-02-28 13:27:47 +08:00
孙广明 260c4c0528 Merge branch 'zenops_62' into 'master'
Zenops 62

See merge request easycorp/zentaopms!7087
2023-02-28 05:22:00 +00:00
zhaoke 0e5b0bedfa * Format code. 2023-02-28 13:19:36 +08:00
liumengyi d480741a01 * Fix bug of computeProgress. 2023-02-28 05:17:52 +00:00
zhaoke 497618313b * Update zanode lang. 2023-02-28 13:14:06 +08:00
tianshujie c82f1a02a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui 2023-02-28 13:13:13 +08:00
zhujinyong 39822c34a6 * Fix bug: orderBy is not defined. 2023-02-28 13:07:35 +08:00
tianshujie b8e6b2fae0 * Modify desc for create user. 2023-02-28 13:05:38 +08:00
caoyanyi 218f57e0e3 * Modify icon name. 2023-02-28 12:31:08 +08:00
caoyanyi ef0c77d611 * Modify tutorial tip. 2023-02-28 12:28:15 +08:00
liumengyi bcaa92b137 * Fix bug #32477. 2023-02-28 03:18:39 +00:00
tianshujie cd595dc605 * Code for fix bug #32461. 2023-02-28 11:03:02 +08:00
liumengyi 0f7851c03a * Fix bug #32464. 2023-02-28 02:59:43 +00:00
liumengyi ffe4cdafb2 * Fix bug #32463. 2023-02-28 02:51:14 +00:00
tianshujie 573b2ef793 * Modify the holiday list style. 2023-02-28 10:36:01 +08:00
tianshujie f6a573a51f * Code for fix bug #32458. 2023-02-28 10:32:13 +08:00
liumengyi 7438d3665b * Fix bug #32457. 2023-02-28 02:28:07 +00:00
zhujinyong 07f2c4520e * Fix bug: hide bug in tree view. 2023-02-28 10:18:51 +08:00