Commit Graph
32106 Commits
Author SHA1 Message Date
xieqiyu 7e2ee4fcdd * Fix bug#22487. 2022-05-13 11:56:46 +08:00
xieqiyu bd8fb230d1 * Fix bug#22409. 2022-05-13 11:55:05 +08:00
xieqiyu 89491d97de * Resolve issue#629. 2022-05-13 03:02:26 +08:00
xieqiyu fa4ea0ff4d * Fix bug#22409. 2022-05-13 00:09:10 +08:00
王怡栋 ce0f556d48 Merge branch 'master_xieqiyu_53666' into 'master'
Master xieqiyu 53666

See merge request easycorp/zentaopms!3384
2022-05-13 02:48:26 +00:00
mayue 2bbc219944 * Fix bug #22411. 2022-05-13 02:33:54 +00:00
孙广明 10a542cc35 Merge branch 'sprint/189_zenggang' into 'master'
* Fix bugs

See merge request easycorp/zentaopms!3374
2022-05-13 01:57:36 +00:00
hufangzhou b9a60485c3 * Fix bug #22439. 2022-05-13 09:33:37 +08:00
王怡栋 24c8d5f010 Merge branch 'sprint/189_hufangzhou_22407' into 'master'
* Fix bug #22407.

See merge request easycorp/zentaopms!3377
2022-05-13 01:14:26 +00:00
hufangzhou 74bf099c98 * Fix bug #22443. 2022-05-13 09:02:56 +08:00
hufangzhou 401ea2f810 * Fix bug #22407. 2022-05-13 08:47:46 +08:00
zenggang 94bf6a70a2 * Adjust code 2022-05-13 00:44:07 +00:00
tianshujie 6770b72b11 * Fix bug #22437. 2022-05-13 08:42:26 +08:00
xieqiyu f5210e857b * Code for task#53666. 2022-05-12 23:27:00 +08:00
xieqiyu 914f474592 * Code for task#53666. 2022-05-12 22:58:17 +08:00
wangyidong 50ec57b390 * code for story #32387. 2022-05-12 19:04:44 +08:00
liumengyi b3fd6f4f53 * Add card desc of productplan card and build card. 2022-05-12 17:22:10 +08:00
王怡栋 a47a3ad064 Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
#   db/update16.5.sql
2022-05-12 09:09:28 +00:00
zenggang e41dc21372 * Fix bugs 2022-05-12 09:06:35 +00:00
lanzongjun 63bd7e6902 * add sql 2022-05-12 17:04:55 +08:00
孙广明 3e677efa79 Merge branch 'sprint/189_mayue_fixbug#22411' into 'master'
* Fix bug #22411.

See merge request easycorp/zentaopms!3370
2022-05-12 08:53:13 +00:00
mayue 44783b57a5 * Optimize code. 2022-05-12 08:52:17 +00:00
王怡栋 57b96215b3 Merge branch 'sprint/189_hufangzhou_issue' into 'master'
* Resolve issue #634.

See merge request easycorp/zentaopms!3369
2022-05-12 08:48:06 +00:00
mayue 96b422d247 * Fix bug #22411. 2022-05-12 08:41:39 +00:00
tianshujie 85469bca87 * Fix bug #22436. 2022-05-12 16:34:23 +08:00
hufangzhou 60f8ffd05e * Resolve issue #634. 2022-05-12 16:24:09 +08:00
李玉春 d618aea1ee Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3368
2022-05-12 07:55:25 +00:00
王怡栋 125a97d530 Merge branch 'sprint/189_hufangzhou_22429' into 'master'
* Fix bug #22429.

See merge request easycorp/zentaopms!3366
2022-05-12 07:55:10 +00:00
王怡栋 66eb00606e Merge branch 'sprint/189_hufangzhou_22399' into 'master'
* Fix bug #22399.

See merge request easycorp/zentaopms!3367
2022-05-12 07:53:53 +00:00
wangyidong aa0f666d41 * adjust for project flow. 2022-05-12 15:52:24 +08:00
hufangzhou a8ce3a757d * Fix bug #22399. 2022-05-12 15:51:02 +08:00
tianshujie 10e48b66d9 * Fix bug #22378. 2022-05-12 15:50:05 +08:00
hufangzhou 4c7619bcb9 * Fix bug #22429. 2022-05-12 15:46:49 +08:00
孙广明 dd4566f1ea Merge branch 'fixbug_sunjun_22349' into 'master'
*Fixbug_sunjun_22349

See merge request easycorp/zentaopms!3356
2022-05-12 07:36:26 +00:00
孙广明 cac35c816c Merge branch 'fixbug_sunjun_22394' into 'master'
*Fixbug_sunjun_22394

See merge request easycorp/zentaopms!3363
2022-05-12 07:36:17 +00:00
孙广明 f4724390f6 Merge branch 'sunhuawei_fixbug' into 'master'
*解决功能演示过程中出现的问题。

See merge request easycorp/zentaopms!3365
2022-05-12 07:36:01 +00:00
孙华伟 a3ab4a596b *解决功能演示过程中出现的问题。 2022-05-12 15:29:28 +08:00
sunjun 276ddada57 *Fixbug_sunjun_22394 2022-05-12 07:07:42 +00:00
sunjun cb00a3b8ac *Fixbug_sunjun_22349 2022-05-12 07:05:20 +00:00
sunjun 8732d9bcd3 *Fixbug_sunjun_22349 2022-05-12 07:01:30 +00:00
王怡栋 fa0b10275e Merge branch 'sprint/daitingting_fix_isClickable' into 'master'
* Check execution privilege in buildOperateMenu function.

See merge request easycorp/zentaopms!3360
2022-05-12 06:06:05 +00:00
mayue f15f8f0345 * Fix bug #22412. 2022-05-12 05:55:25 +00:00
daitingting da18989aa2 * Remove testin codes. 2022-05-12 05:55:14 +00:00
daitingting e99212a7bc * Check execution privilege in buildOperateMenu function. 2022-05-12 05:52:16 +00:00
wangyidong c04ec4db8f * fix for merge program when upgrade. 2022-05-12 13:46:57 +08:00
mayue 53638cb9f2 * Fix bug. 2022-05-12 05:40:39 +00:00
王怡栋 9cd2982d2e Merge branch 'sprint/189_hufangzhou_22364' into 'master'
* Fix bug #22364.

See merge request easycorp/zentaopms!3358
2022-05-12 05:38:14 +00:00
hufangzhou d99acc8cf8 * Remove the unused code. 2022-05-12 13:37:11 +08:00
李玉春 70fcf381cf Merge branch 'sunhuawei_fixbug_22365' into 'master'
Sunhuawei fixbug 22365

See merge request easycorp/zentaopms!3352
2022-05-12 05:33:28 +00:00
hufangzhou 80124c681e * Fix bug #22364. 2022-05-12 13:29:39 +08:00