Commit Graph
36785 Commits
Author SHA1 Message Date
王怡栋 e8478894c4 Merge branch 'master_xieqiyu_test' into 'master'
Master xieqiyu test

See merge request easycorp/zentaopms!5261
2022-09-05 05:10:05 +00:00
王怡栋 0e1038275f Merge branch 'sprint/235_liumengyi_27238' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!5259
2022-09-05 05:09:06 +00:00
王怡栋 9f2a83fa19 Merge branch 'bug_26943' into 'master'
* Fix bug#26943

See merge request easycorp/zentaopms!5258
2022-09-05 05:08:45 +00:00
王怡栋 9ed4f6bdd4 Merge branch 'sprint/hufangzhou_25840' into 'master'
* Fix bug #25840.

See merge request easycorp/zentaopms!5252
2022-09-05 05:08:21 +00:00
王怡栋 88a75824f7 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #27198

See merge request easycorp/zentaopms!5251
2022-09-05 05:05:12 +00:00
lanzongjun 499e5f875a add module tree 2022-09-05 11:33:06 +08:00
wangyidong 86ebfc0480 * fix bug #27262. 2022-09-05 11:30:25 +08:00
lanzongjun f7922c8c70 * fix bug #27198 2022-09-05 11:03:26 +08:00
lanzongjun c4ed80d958 * fix bug #27198 2022-09-05 10:59:46 +08:00
sunguangming bd80adb658 * Code for recordestimate style. 2022-09-05 09:19:10 +08:00
wangyidong cff2453097 * fix bug #26362. 2022-09-05 08:54:26 +08:00
wangyidong c5a129d777 * fix bug #27243. 2022-09-05 08:47:10 +08:00
wangyidong 574fd06e71 * adjust for task #67404. 2022-09-05 08:36:17 +08:00
xieqiyu cb55199df4 * Modify the test case of personnel and product. 2022-09-04 16:36:37 +08:00
xieqiyu 066b6a129d * Modify project and release test case. 2022-09-04 12:20:01 +08:00
Lufei 51bd204786 * Fix return value declaration error of getFeishuData. 2022-09-03 09:58:36 +08:00
wangyidong 4635256fb9 * adjust for record estimate for linear task. 2022-09-02 17:51:04 +08:00
liumengyi 264fb13c2e * Fix bug. 2022-09-02 17:16:59 +08:00
liumengyi 609a2e3b46 * Fix bug. 2022-09-02 17:11:37 +08:00
王怡栋 158bd704f8 Merge branch 'sprint/235_liumengyi_27238' into 'master'
* Fix bug #27135,#27034.

See merge request easycorp/zentaopms!5255
2022-09-02 09:08:48 +00:00
liumengyi 623aa4ef63 * Fix bug. 2022-09-02 17:07:52 +08:00
liumengyi 823a9af768 * Fix bug. 2022-09-02 17:03:56 +08:00
zenggang e96c5b3818 * Fix bug#26943 2022-09-02 09:00:58 +00:00
王怡栋 5cad8843e7 Merge branch 'master_xieqiyu_27244' into 'master'
* Fix bug#27244.

See merge request easycorp/zentaopms!5257
2022-09-02 08:38:50 +00:00
liumengyi 4274a50e94 * Fix bug #27034. 2022-09-02 16:25:51 +08:00
wangyidong c94a577c96 * adjust for task #67404. 2022-09-02 16:20:15 +08:00
xieqiyu 6bcc09aeca * Fix bug#27244. 2022-09-02 14:42:22 +08:00
lanzongjun 68f3005568 feedback action modify todolist 2022-09-02 14:30:02 +08:00
王怡栋 f1ce6c51a6 Merge branch 'estimate2effort' into 'master'
* Merge task estimate to effort.

See merge request easycorp/zentaopms!5254
2022-09-02 06:28:06 +00:00
liumengyi 87d7696f90 * Fix bug #27135. 2022-09-02 14:19:47 +08:00
sunguangming 54c54108e6 * Code for task effort. 2022-09-02 14:17:39 +08:00
sunguangming dbcc64cc4c * Add order to effort. 2022-09-02 14:05:14 +08:00
sunguangming d5ee1ab4f3 * Merge task estimate to effort. 2022-09-02 13:52:56 +08:00
hufangzhou c77fde0166 * Code for bug #25840. 2022-09-02 13:48:50 +08:00
liumengyi c5e91ea120 * Optimize code for bug #27238. 2022-09-02 13:48:24 +08:00
liumengyi 3509477e6b * Fix bug #27238, and fix bug for set switcher. 2022-09-02 13:44:45 +08:00
hufangzhou 159fcd07e7 * Fix bug #25840. 2022-09-02 13:37:05 +08:00
lanzongjun 91da8c65f6 remove feedback action 2022-09-02 13:17:27 +08:00
王怡栋 1a9ba95c43 Merge branch 'master_xieqiyu_66955' into 'master'
* Code for task#66955.

See merge request easycorp/zentaopms!5245
2022-09-02 05:07:46 +00:00
王怡栋 413c6d64ba Merge branch 'sprint/hufangzhou_26131' into 'master'
* Fix bug #26131.

See merge request easycorp/zentaopms!5244
2022-09-02 05:04:18 +00:00
王怡栋 6376b09468 Merge branch 'sprint/235_dongli_bug27225' into 'master'
* Fix bug #27225.

See merge request easycorp/zentaopms!5249
2022-09-02 05:02:51 +00:00
dongli 36389ce51e * Fix bug #27225. 2022-09-02 04:29:10 +00:00
liumengyi 7b4a22093c * Fix issue #731. 2022-09-02 11:29:49 +08:00
王怡栋 17b58bc39b Merge branch 'sprint/235_liutian_fixissue' into 'master'
* Fix issue #731, #728, #727, #726.

See merge request easycorp/zentaopms!5247
2022-09-02 02:57:35 +00:00
liumengyi 26ba81c2a6 * Optimize code. 2022-09-02 10:56:48 +08:00
wangyidong d1cb72d4a2 * code for task #67405. 2022-09-02 10:49:29 +08:00
liumengyi f667c53c82 * Fix issue #731. 2022-09-02 10:46:07 +08:00
xieqiyu 62e9b5aa44 * Code for task#66955. 2022-09-02 09:44:14 +08:00
hufangzhou c64c9bbf3e * Fix bug #26131. 2022-09-02 09:32:41 +08:00
liumengyi 65e3fc9034 * Fix issue #731. 2022-09-02 09:11:42 +08:00