Commit Graph
40440 Commits
Author SHA1 Message Date
田淑杰 edd54c534e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-19 08:55:38 +08:00
孙广明 aedf34e7dc Merge branch 'master_xieqiyu_30291' into 'master'
* Fix bug#30291.

See merge request easycorp/zentaopms!6585
2022-12-16 08:22:35 +00:00
孙广明 a5a440f62e Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug

See merge request easycorp/zentaopms!6584
2022-12-16 07:55:58 +00:00
xieqiyu d0fb46062d * Fix bug#30291. 2022-12-16 15:55:54 +08:00
lanzongjun cbe351104a * Fix Bug 2022-12-16 15:55:01 +08:00
孙广明 6fe0374751 Merge branch 'master_xieqiyu_30855' into 'master'
* Fix bug#30855.

See merge request easycorp/zentaopms!6582
2022-12-16 07:09:28 +00:00
孙广明 4c98d0cd33 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30957

See merge request easycorp/zentaopms!6583
2022-12-16 07:09:02 +00:00
lanzongjun febbe41e69 * Fix Bug #30957 2022-12-16 15:01:38 +08:00
xieqiyu af8cf547ea * Fix bug#30855. 2022-12-16 14:52:42 +08:00
孙广明 1bfeab6584 Merge branch 'sprint/hufangzhou_feature_deleteBI' into 'master'
* Remove the bi's info from the version.

See merge request easycorp/zentaopms!6578
2022-12-16 06:34:28 +00:00
xieqiyu 61e41379be * Fix bug#30583. 2022-12-16 14:23:21 +08:00
hufangzhou 73207bedbb * Remove the bi's info from the version. 2022-12-16 06:04:42 +00:00
孙广明 ad96400f69 Merge branch 'sprint/272_tianshujie' into 'sprint/272'
Sprint/272 tianshujie

See merge request easycorp/zentaopms!6577
2022-12-16 05:59:30 +00:00
孙广明 4ffbfab306 * Fix bug #30929. 2022-12-16 13:44:44 +08:00
caoyanyi 1748e9a48c Merge branch 'master' into sprint/272_tianshujie 2022-12-16 13:39:04 +08:00
孙广明 6036606f6e Merge branch 'master_xieqiyu_30866' into 'master'
* Fix bug#30866.

See merge request easycorp/zentaopms!6572
2022-12-16 05:07:06 +00:00
孙广明 294ab34e83 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug product release show error #30883

See merge request easycorp/zentaopms!6573
2022-12-16 05:06:52 +00:00
孙广明 dc33dd6283 Merge branch 'master_xieqiyu_30891' into 'master'
* Fix bug#30891.

See merge request easycorp/zentaopms!6576
2022-12-16 05:06:37 +00:00
孙广明 9a6929062a * Fix bug #30882. 2022-12-16 11:12:40 +08:00
xieqiyu f17dbd2c68 * Fix bug#30861. 2022-12-16 11:01:03 +08:00
lanzongjun 8e7afd50c9 * Fix Bug #30883 2022-12-16 11:00:36 +08:00
田淑杰 38f1576937 * Finish task #79626. 2022-12-16 10:41:52 +08:00
xieqiyu dc425fd923 * Fix bug#30891. 2022-12-16 10:36:40 +08:00
孙广明 8649716ad4 * Fix bug #30916. 2022-12-16 10:30:46 +08:00
lanzongjun 09ccb1ebd7 * Fix Bug product release show error 2022-12-16 09:44:55 +08:00
田淑杰 5b8d6f92d9 Merge branch 'sprint/272' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272_tianshujie 2022-12-16 08:40:13 +08:00
xieqiyu 0fb96ef566 * Fix bug#30866. 2022-12-15 17:04:03 +08:00
wangzemei e596b31431 * project/manageMembers: optimize the style of the picker 2022-12-15 16:41:34 +08:00
王怡栋 2225fa3632 Merge branch 'zentaopms_bug_#30911' into 'master'
* Fix bug #30911.

See merge request easycorp/zentaopms!6566
2022-12-15 08:27:11 +00:00
孙广明 c893ac76d8 Merge branch 'master_liuhong_30907' into 'master'
Master liuhong 30907

See merge request easycorp/zentaopms!6567
2022-12-15 08:20:12 +00:00
孙广明 7ab740a26b Merge branch 'master_xieqiyu_30901' into 'master'
* Fix bug#30901.

See merge request easycorp/zentaopms!6568
2022-12-15 08:20:01 +00:00
xieqiyu 5c34348cd9 * Fix bug#30901. 2022-12-15 16:18:18 +08:00
liuhong cc631b6e4f * Adjust code #30907. 2022-12-15 08:15:03 +00:00
liuhong a08eff199f * Fix bug #30907. 2022-12-15 08:12:15 +00:00
daitingting d241f76e49 * Fix bug #30911. 2022-12-15 08:10:58 +00:00
孙广明 47817d9153 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30879

See merge request easycorp/zentaopms!6565
2022-12-15 08:10:30 +00:00
lanzongjun 9d0a087132 * Fix Bug #30879 2022-12-15 16:09:01 +08:00
孙广明 b827ae2002 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* fix bug #30796#30765#79453#30886#30909

See merge request easycorp/zentaopms!6549
2022-12-15 07:58:29 +00:00
孙广明 2bcd6ed191 Merge branch 'master_xieqiyu_30844' into 'master'
* Fix bug#30844.

See merge request easycorp/zentaopms!6553
2022-12-15 07:57:10 +00:00
lanzongjun a8551febe5 * Fix Bug #30909 2022-12-15 15:54:33 +08:00
孙广明 7bb5217ea9 Merge branch 'master_xieqiyu_79440' into 'master'
* Code for task#79440.

See merge request easycorp/zentaopms!6556
2022-12-15 07:53:13 +00:00
孙广明 bb418ee465 Merge branch 'sprint/fixbug_liumengyi_30896' into 'master'
* Fix bug #30896.

See merge request easycorp/zentaopms!6558
2022-12-15 07:52:58 +00:00
孙广明 2dd370e821 Merge branch 'master_xieqiyu_79444' into 'master'
* Code for task#79444.

See merge request easycorp/zentaopms!6560
2022-12-15 07:50:27 +00:00
孙广明 e173f7e3bf Merge branch 'master_liuhong_30897' into 'master'
* Fix bug #30897.

See merge request easycorp/zentaopms!6561
2022-12-15 07:49:58 +00:00
孙广明 53c2ae7089 Merge branch 'master_xieqiyu_30803' into 'master'
* Fix bug#30803.

See merge request easycorp/zentaopms!6562
2022-12-15 07:49:22 +00:00
孙广明 a788dedd50 * Fix bug #30916. 2022-12-15 15:46:34 +08:00
孙广明 2a2ea5e9b0 * Remove unused code. 2022-12-15 15:33:15 +08:00
孙广明 4acb2e69ec * Fix bug #30658. 2022-12-15 15:17:10 +08:00
xieqiyu e6d364c246 * Fix bug#30803. 2022-12-15 15:12:24 +08:00
王怡栋 6fe7f03e7e Merge branch 'feedback_1576' into 'master'
* Resolve feedback#1576

See merge request easycorp/zentaopms!6530
2022-12-15 06:53:08 +00:00