Commit Graph
48113 Commits
Author SHA1 Message Date
王怡栋 cc0fb8eeef Merge branch 'master_bug_23269' into 'master'
* Fix bug #23269.

See merge request easycorp/zentaopms!6306
2022-11-23 01:55:01 +00:00
王怡栋 abca6db236 Merge branch 'zentaopms_263_bug#30045' into 'master'
* Fix bug #30045.

See merge request easycorp/zentaopms!6308
2022-11-23 01:54:26 +00:00
王怡栋 1c008655e1 Merge branch 'zentaopms_263_bug#29994' into 'master'
* Fix bug #29994.

See merge request easycorp/zentaopms!6311
2022-11-23 01:53:52 +00:00
王怡栋 c82784f408 Merge branch 'zentaopms_263_wangyuting' into 'master'
* Optimize code with review code.

See merge request easycorp/zentaopms!6312
2022-11-23 01:53:20 +00:00
王怡栋 f53e8d7664 Merge branch 'zentaopms_263_task_#77137' into 'master'
* Finish task #77137.

See merge request easycorp/zentaopms!6313
2022-11-23 01:52:41 +00:00
wangyuting f7225b0170 * Optimize code with review code. 2022-11-23 01:44:59 +00:00
daitingting 7f19feff3a * Finish task #77137. 2022-11-23 01:43:12 +00:00
wangyuting 5835a11610 * Fix bug #29994. 2022-11-23 01:40:30 +00:00
孙广明 dc4333ef34 Merge branch 'sprint/zentaopms262_mayue_bug#29945' into 'master'
* Optimize code about bug #29945.

See merge request easycorp/zentaopms!6307
2022-11-23 01:31:04 +00:00
wangyuting 63a249eeca * Fix bug #30045. 2022-11-23 01:29:34 +00:00
mayue 410b839c15 * Optimize code about bug #29945. 2022-11-23 09:29:30 +08:00
Yagami 2f98f46365 * Finish task #77275. 2022-11-23 09:25:48 +08:00
孙广明 c3b5086237 Merge branch 'sprint/zentaopms262_mayue_bug#29945' into 'master'
* Fix bug #29945.

See merge request easycorp/zentaopms!6305
2022-11-23 00:52:47 +00:00
liuhong 6f272700be * Fix bug #23269. 2022-11-23 00:48:31 +00:00
mayue de42397894 * Fix bug #29945. 2022-11-23 08:41:11 +08:00
王怡栋 3de3777bfa * adjust for getBuildPairs. 2022-11-22 17:25:29 +08:00
王怡栋 d09370ba2d * fix bug #30077. 2022-11-22 17:25:29 +08:00
孙广明 accff7863e Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #77261

See merge request easycorp/zentaopms!6304
2022-11-22 09:15:32 +00: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
孙广明 eb0a76d1d5 Merge branch 'sprint/fixbug_liumengyi_28580' into 'master'
* Fix bug #28580.

See merge request easycorp/zentaopms!6296
2022-11-22 08:53:23 +00:00
孙广明 e1b4fbff0b Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #77278#77266#77260#77262

See merge request easycorp/zentaopms!6299
2022-11-22 08:50:49 +00:00
lanzongjun 1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
王怡栋 142893f511 Merge branch 'zentaopms_263_wangyuting' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6303
2022-11-22 08:40:00 +00:00
wangyuting 3df06bbb03 * Optimize code. 2022-11-22 08:37:59 +00:00
王怡栋 f4edba03f1 Merge branch 'zentaopms_263_wangyuting' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6302
2022-11-22 08:31:35 +00:00
王怡栋 04ced67953 Merge branch 'zentaopms_263_task_#77143' into 'master'
* Finish task #77143.

See merge request easycorp/zentaopms!6301
2022-11-22 08:31:21 +00:00
wangyuting ad77b61dde * Optimize code. 2022-11-22 08:30:08 +00:00
daitingting 3750be48c5 * Finish task #77143. 2022-11-22 08:17:17 +00:00
王怡栋 72106fa341 Merge branch 'master_feedback_1468' into 'master'
* Adjust code for feedback #1468.

See merge request easycorp/zentaopms!6300
2022-11-22 08:02:34 +00: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
lanzongjun 740e3e673b * Fix Task #77260 2022-11-22 15:35:34 +08:00
王怡栋 827f04e98a * fix bug #30094. 2022-11-22 15:34:40 +08:00
王怡栋 a1cded3942 Merge branch 'zentaopms_263_task#77131' 2022-11-22 15:08:29 +08:00
王怡栋 0699b9e061 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 15:07:51 +08:00
lanzongjun 54d3819cb6 * Fix Task #77266 2022-11-22 15:06:30 +08:00
Yagami 8c7611d8c3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 15:05:14 +08:00
Yagami 9e0c890def * Fix task list bug. 2022-11-22 15:05:04 +08:00
王 于听 81b50aa44b Merge branch 'master' into 'zentaopms_263_task#77131'
# Conflicts:
#   module/build/lang/de.php
#   module/build/lang/en.php
#   module/build/lang/fr.php
#   module/build/lang/zh-cn.php
2022-11-22 07:04:14 +00:00
王怡栋 b996270738 * code for task #77138. 2022-11-22 14:56:48 +08:00
liuhong d44f253a49 * Adjust code for feedback #1468. 2022-11-22 06:50:35 +00:00
王怡栋 c8abe9f23a Merge branch 'zentaopms_263_task#77140' into 'master'
* Finish task #77140.

See merge request easycorp/zentaopms!6297
2022-11-22 06:39:17 +00:00
Yagami b9eba9ce2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-22 14:27:57 +08:00
Yagami e4a80e800d * Finish task #76953. 2022-11-22 14:27:38 +08:00
lanzongjun a3f8f5f437 * Fix Task #77278 2022-11-22 14:23:01 +08:00
wangyuting befbe1f3d7 * Finish task #77131、#77142、#77141. 2022-11-22 06:09:07 +00:00
wangyuting 8c6753ea42 * Finish task #77140. 2022-11-22 06:03:51 +00:00
王怡栋 18d88bad03 Merge branch 'tianshujie_fixbug' into 'master'
* Fixed pager jump error in the use case list.

See merge request easycorp/zentaopms!6294
2022-11-22 06:01:41 +00:00
王怡栋 44caf18a51 Merge branch 'zentaopms_263_task#77130' into 'master'
* Finish task #77130.

See merge request easycorp/zentaopms!6292
2022-11-22 06:01:07 +00:00
王怡栋 a2d5371030 * code for task #77138,77135,77134,77133,77132,77129. 2022-11-22 13:54:33 +08:00