Commit Graph

413 Commits

Author SHA1 Message Date
朱金勇
97d9e06807 * Fix bug#34391. 2023-04-19 08:05:12 +00:00
朱金勇
0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
王怡栋
bf5c829e3d Merge branch 'sprint/304_liumengyi_89851' into 'master'
* Finish task #89851.

See merge request easycorp/zentaopms!7286
2023-04-03 01:45:23 +00:00
liumengyi
295c53d6ee * Finish task #89851. 2023-04-03 09:22:02 +08:00
tianshujie
d30de7b7a2 * Code for task #89153. 2023-03-29 13:23:39 +08:00
liumengyi
19fe5417de * Fix bug #32640. 2023-03-15 06:34:32 +00:00
王怡栋
49c755c8a6 Merge branch 'tsj_fixbug' into 'master'
* Add skip stash page.

See merge request easycorp/zentaopms!7188
2023-03-15 01:36:22 +00:00
tianshujie
8580b13627 * Fix bug 32911. 2023-03-14 15:05:42 +08:00
wangxuepeng
7f45a3d34f * Fixed bug #87025. 2023-03-14 05:09:14 +00:00
caoyanyi
234347cede * Update project common language. 2023-03-07 15:58:38 +08:00
Yagami
f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
孙广明
1ec9676309 Merge branch 'fixbug_liumengyi' into 'master'
* Fix bug 32578, and fix bug of set path.

See merge request easycorp/zentaopms!7118
2023-03-02 00:48:31 +00:00
Yagami
73b5269051 * Fix bug #32428. 2023-03-02 08:37:15 +08:00
liumengyi
72b0baa4cd * Fix bug #32578, and fix bug of set path. 2023-03-02 00:29:11 +00:00
王怡栋
a1c1af8469 Merge branch 'sprint/hufangzhou_bug_32426' into 'master'
* Fix bug #32426.

See merge request easycorp/zentaopms!7105
2023-03-01 10:15:30 +00:00
王怡栋
b8b59cba27 Merge branch 'sprint/hufangzhou_bug_32476' into 'master'
* Fix bug #32476.

See merge request easycorp/zentaopms!7103
2023-03-01 10:15:15 +00:00
孙广明
db4662cfbc Merge branch 'cyy_bug' into 'master'
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
2023-03-01 09:13:25 +00:00
tianshujie
fdc0e3fa41 * Code for fix bug #32567. 2023-03-01 15:56:55 +08:00
liumengyi
2bcf84cf2a * Fix bug #32540. 2023-03-01 06:40:51 +00:00
liumengyi
afd1f05159 * Fix bug #32423. 2023-03-01 06:03:02 +00:00
hufangzhou
4357e448f7 * Fix bug #32426. 2023-03-01 03:32:53 +00:00
hufangzhou
200af8e045 * Fix bug #32476. 2023-03-01 03:16:04 +00:00
hufangzhou
e93bfa4498 * Fix bug #32518. 2023-03-01 00:55:15 +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
cbed975b74 * Fix bug #32477, and fix bug of change parent stage. 2023-02-28 05:44:39 +00:00
zhujinyong
39822c34a6 * Fix bug: orderBy is not defined. 2023-02-28 13:07:35 +08:00
liumengyi
bcaa92b137 * Fix bug #32477. 2023-02-28 03:18:39 +00:00
liumengyi
226f798470 * Finish task #85631. 2023-02-27 08:08:07 +00:00
孙广明
167539f822 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Modify menu name.

See merge request easycorp/zentaopms!7076
2023-02-27 06:59:14 +00:00
liumengyi
599150da94 * Fix bug #32442. 2023-02-27 06:58:37 +00:00
tianshujie
16903e6247 * Modify method tip of stage create page. 2023-02-27 14:14:48 +08:00
hufangzhou
64bb25430b * Add the programplan unit testcase. 2023-02-25 03:19:49 +00:00
liumengyi
137dcf1e9a * * Optimize code for create waterfallplus execution. 2023-02-24 05:06:14 +00:00
liumengyi
eef6386ad9 * Optimize code for radio button. 2023-02-24 04:28:51 +00:00
liumengyi
b9e400b4a0 * Change the drop-down box to a radio button. 2023-02-24 04:25:44 +00:00
tianshujie
af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
tianshujie
deae64dcd1 * Add a prompt for the execution type. 2023-02-22 10:38:25 +08:00
tianshujie
1c1fd123da * Code for finish task #85415. 2023-02-22 10:21:56 +08:00
tianshujie
49e0ae82c6 * Code for finish task #85415. 2023-02-22 09:54:38 +08:00
孙广明
6c1ed365ab Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.

See merge request easycorp/zentaopms!7010
2023-02-21 05:50:04 +00:00
zhujinyong
5551177931 + Add error of different type. 2023-02-21 10:24:00 +08:00
liumengyi
95e3978fb0 * Finish task #85038, #85039. 2023-02-21 01:05:24 +00:00
Yagami
dc9eb5a1a4 * Finish task #85048. 2023-02-21 08:59:26 +08:00
王怡栋
c004967af9 Merge branch 'sprint/290_liumengyi_32244' into 'master'
* Fix bug #32244, #32245, #32249, #32251,  #32255, #32179, @32167.

See merge request easycorp/zentaopms!6989
2023-02-20 01:16:52 +00:00
王怡栋
bc4efa791c Merge branch 'sprint/290_liumengyi_84586' into 'master'
* Finish task #84586.

See merge request easycorp/zentaopms!6987
2023-02-20 01:15:52 +00:00
hufangzhou
aaeeb9372d * Code for task #84583. 2023-02-19 09:17:49 +00:00
hufangzhou
75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
liumengyi
0ad1aba2ee * Fix bug #32255. 2023-02-18 08:38:13 +00:00
liumengyi
02adc7454f * Fix bug #32251. 2023-02-18 07:27:40 +00:00
liumengyi
b1f57ce0da * Fix bug #32244, #32245. 2023-02-17 07:50:45 +00:00