Commit Graph
38161 Commits
Author SHA1 Message Date
mayue aeda6fbe78 * Fix bug #22064#22065. 2022-04-28 06:43:05 +00:00
孙广明 8d8b999608 Merge branch 'fixbug_sunjun_17329' into 'master'
*Fixbug_sunjun_17329

See merge request easycorp/zentaopms!3188
2022-04-28 06:23:11 +00:00
孙广明 1cb36eb72c Merge branch 'liyuchun_fixbug_22074' into 'master'
* Fix bug #22075.

See merge request easycorp/zentaopms!3185
2022-04-28 06:22:29 +00:00
李玉春 9e3fa76383 Merge branch 'cyy_7006' into 'master'
* Fix bug #7006.

See merge request easycorp/zentaopms!3187
2022-04-28 06:20:23 +00:00
liyuchun 11af6b43a2 * Fix bug #15245. 2022-04-28 06:19:27 +00:00
sunjun 7f7f3013ea *Fixbug_sunjun_17329 2022-04-28 06:18:13 +00:00
caoyanyi 5fd5b34e97 * Modify check ip function. 2022-04-28 14:06:08 +08:00
liyuchun 81903f2fe5 * Fix bug #15563. 2022-04-28 06:05:39 +00:00
caoyanyi d517513c69 * Fix bug #7006. 2022-04-28 14:03:33 +08:00
孙广明 f3c333119c Merge branch 'fixbugs_zhouxin' into 'master'
* Adjust code.

See merge request easycorp/zentaopms!3186
2022-04-28 05:59:16 +00:00
zhouxin 2178892254 * Fix bug #21929. 2022-04-28 05:56:51 +00:00
liyuchun b65976522e * Fix bug #22074. 2022-04-28 05:49:13 +00:00
zhouxin 1cd78770ef * Adjust code. 2022-04-28 05:47:02 +00:00
liyuchun 1729e30cb4 * Fix bug #22075. 2022-04-28 05:46:42 +00:00
孙广明 aff78c6d45 Merge branch 'fixbug_sunjun_17828' into 'master'
*Fixbug_sunjun_17828

See merge request easycorp/zentaopms!3183
2022-04-28 05:30:05 +00:00
sunjun 445279bb1a *Fixbug_sunjun_17828 2022-04-28 05:26:17 +00:00
wangyidong 4e24558f9f * code for bug #15815. 2022-04-28 11:54:46 +08:00
wangyidong fbd33f5262 * code bug #15815. 2022-04-28 11:54:46 +08:00
李玉春 6f130ea443 Merge branch 'sprint/fixbug_liumengyi_14473' into 'master'
* Fix bug #14472.

See merge request easycorp/zentaopms!3180
2022-04-28 03:30:50 +00:00
liumengyi 69cac92d99 * Fix bug #14472. 2022-04-28 11:26:06 +08:00
李玉春 741eb954d9 Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Count the use cases under the use case library.

See merge request easycorp/zentaopms!3167
2022-04-28 03:19:47 +00:00
孙广明 81afb22236 Merge branch 'master_xieqiyu_14383' into 'master'
* Fix bug#14383.

See merge request easycorp/zentaopms!3178
2022-04-28 03:18:02 +00:00
tianshujie 1546b92f17 * Delete extra blank lines. 2022-04-28 11:16:18 +08:00
tianshujie c8bae4538a * Restore code. 2022-04-28 11:15:29 +08:00
王怡栋 ae63462ee1 Merge branch 'sgm_fixbug' into 'master'
* Code for weekly bug.

See merge request easycorp/zentaopms!3179
2022-04-28 03:11:44 +00:00
wangyidong af305d0916 * code bug #21710. 2022-04-28 11:07:17 +08:00
朱金勇 b7ca5dc86c Merge branch 'sprint/fixbug_hufangzhou_15582' into 'master'
* Fix bug #15582.

See merge request easycorp/zentaopms!3177
2022-04-28 03:04:35 +00:00
朱金勇 d8fb6d30a4 Merge branch 'sprint/fixbug_hufangzhou_16114' into 'master'
* Fix bug #16114.

See merge request easycorp/zentaopms!3171
2022-04-28 03:04:07 +00:00
tianshujie 7f7a50ea12 * Fix bug #2795. 2022-04-28 11:02:38 +08:00
xieqiyu 535257a9a7 * Fix bug#14383. 2022-04-28 10:59:54 +08:00
hufangzhou bad39397ce * Fix bug #15582. 2022-04-28 10:56:13 +08:00
孙广明 950c04080c Merge branch 'api_zry' into 'master'
Api zry

See merge request easycorp/zentaopms!3173
2022-04-28 02:53:11 +00:00
孙广明 50f4cf9236 Merge branch 'fixbug_sunjun_22007' into 'master'
*Fixbug_sunjun_22007

See merge request easycorp/zentaopms!3176
2022-04-28 02:52:46 +00:00
孙广明 b1482f6b8a Merge branch 'sprint/scx_storyapi' into 'master'
* Add story->productStatus.

See merge request easycorp/zentaopms!3175
2022-04-28 02:50:29 +00:00
sunjun c2d9f7b240 *Fixbug_sunjun_22007 2022-04-28 02:48:11 +00:00
孙广明 e282c7ffbe * Code for weekly bug. 2022-04-28 10:37:01 +08:00
wangyidong eca27bd9ed Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-28 10:32:36 +08:00
wangyidong 8f437f4537 * code for bug #22057. 2022-04-28 10:32:24 +08:00
= c5c2362da7 * Add story->productStatus. 2022-04-28 10:26:06 +08:00
孙广明 8ac6a03c29 Merge branch 'liyuchun_fixbug_15039' into 'master'
* Fix bug #15039.

See merge request easycorp/zentaopms!3174
2022-04-28 02:22:01 +00:00
孙广明 2da299adfe Merge branch 'liyuchun_fixbug_22015' into 'master'
Liyuchun fixbug 22015

See merge request easycorp/zentaopms!3145
2022-04-28 02:20:59 +00:00
liyuchun 537c1bea2d * Fix bug #15039. 2022-04-28 02:06:10 +00:00
zhengrunyu aae6c0c378 * Delete api. 2022-04-28 09:55:35 +08:00
zhengrunyu 5daa800c2c * Fix api for limit. 2022-04-28 09:41:35 +08:00
孙广明 debd3fd2a4 Merge branch 'fixbugs_zhouxin_22044' into 'master'
* Fix bug #22044.

See merge request easycorp/zentaopms!3172
2022-04-28 01:36:40 +00:00
zhouxin a470e1e83e * Fix bug #22044. 2022-04-28 01:29:42 +00:00
hufangzhou e550e0ded6 * Fix bug #16114. 2022-04-28 08:42:56 +08:00
李玉春 648179b129 Merge branch 'bug_2942' into 'master'
Fix bug#2942,15431,21981

See merge request easycorp/zentaopms!3160
2022-04-28 00:10:45 +00:00
王怡栋 ec08b7bfcc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #22008

See merge request easycorp/zentaopms!3162
2022-04-27 09:29:23 +00:00
王怡栋 56f4a1a6df Merge branch 'fixbug' into 'master'
* Fix bug #15677.

See merge request easycorp/zentaopms!3156
2022-04-27 09:28:49 +00:00