Commit Graph
41437 Commits
Author SHA1 Message Date
王怡栋 d0c837df51 Merge branch 'master_xieqiyu_30968' into 'master'
* Fix bug#30968.

See merge request easycorp/zentaopms!6837
2023-02-02 05:46:18 +00:00
王怡栋 939089b325 Merge branch 'sprint/fixbug_tanghucheng' into 'master'
* Fix bug #25334.

See merge request easycorp/zentaopms!6836
2023-02-02 05:45:48 +00:00
朱金勇 20ba4f390c Merge branch 'fix/compatible' into 'master'
* Fix compatible error.

See merge request easycorp/zentaopms!6832
2023-02-02 03:46:31 +00:00
鲁飞 741917d2ab * Fix compatible error. 2023-02-02 03:46:31 +00:00
xieqiyu 2468300051 * Fix bug#30968. 2023-02-02 10:06:33 +08:00
tanghucheng e001f2a00b * Fix bug #25334. 2023-02-02 09:42:45 +08:00
王怡栋 aea7178985 Merge branch 'sprint/feedback2047' into 'master'
* Fix feedback 2047.

See merge request easycorp/zentaopms!6834
2023-02-02 01:24:36 +00:00
王怡栋 f98b046674 Merge branch 'master_bug_30814' into 'master'
* Fix bug #30814

See merge request easycorp/zentaopms!6833
2023-02-02 01:24:04 +00:00
王怡栋 183929538c Merge branch 'bugfix/workflowFile20230201' into 'master'
* Resolved feedback #2065, workflow extend file type field can not linkage.

See merge request easycorp/zentaopms!6835
2023-02-02 01:20:04 +00:00
hufangzhou 3d4ae057f3 * Fix bug for bug #30770. 2023-02-02 01:08:42 +00:00
孙广明 59a70a4a00 Merge branch 'songpeiyan_bug#30856' into 'master'
*Fix bug #30856

See merge request easycorp/zentaopms!6829
2023-02-02 00:46:04 +00:00
tanghucheng 61c09d7c32 * Fix bug #29989. 2023-02-02 08:43:52 +08:00
songpeiyan bdd962fe94 * Fix bug #30856 2023-02-02 08:43:27 +08:00
孔令茂 b15855b19b * Resolved feedback #2065, workflow extend file type field can not linkage. 2023-02-01 17:24:56 +08:00
王怡栋 182ce3e6a3 Merge branch 'master_xieqiyu_30144' into 'master'
* Fix bug#30144.

See merge request easycorp/zentaopms!6826
2023-02-01 09:16:20 +00:00
王怡栋 0be2cc5302 Merge branch 'master_xieqiyu_31864' into 'master'
* Fix bug#31864.

See merge request easycorp/zentaopms!6824
2023-02-01 09:15:40 +00:00
王怡栋 78c6c67a55 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!6823
2023-02-01 09:15:12 +00:00
王怡栋 6da21196a9 Merge branch 'master_xieqiyu_30280' into 'master'
* Fix bug#30280.

See merge request easycorp/zentaopms!6822
2023-02-01 09:14:21 +00:00
王怡栋 5340535915 Merge branch 'sprint/hufangzhou_bug_30770' into 'master'
* Fix bug #30770.

See merge request easycorp/zentaopms!6830
2023-02-01 09:12:24 +00:00
hufangzhou 0e00ce3a8f * Fix bug #30770. 2023-02-01 08:50:39 +00:00
songpeiyan b1927d4cd2 *Fix bug #30856 2023-02-01 16:46:42 +08:00
liuyongkai 3dfb278fc4 * Resolve ticket #2072. 2023-02-01 16:37:24 +08:00
liuyongkai 438fb830e5 * Resolve ticket #2072. 2023-02-01 16:32:48 +08:00
xieqiyu 770750c9db * Fix bug#30144. 2023-02-01 16:23:59 +08:00
孙广明 fd06ece2f1 Merge branch 'songpeiyan_bug#30079' into 'master'
Songpeiyan bug#30079

See merge request easycorp/zentaopms!6825
2023-02-01 07:57:41 +00:00
孙广明 95972539ab Merge branch 'songpeiyan_bug#31558' into 'master'
* Fix bug #31558.

See merge request easycorp/zentaopms!6821
2023-02-01 07:56:43 +00:00
songpeiyan bfa6c4bd29 Fix bug #30079 2023-02-01 15:48:45 +08:00
songpeiyan b1d3eb75f8 *Fix bug #30079 2023-02-01 15:41:00 +08:00
xieqiyu bbf3f25c27 * Fix bug#31864. 2023-02-01 15:28:05 +08:00
xieqiyu 859dbbc471 * Fix bug#30280. 2023-02-01 14:32:18 +08:00
songpeiyan f8eba3cc9b * Fix bug #31558. 2023-02-01 14:30:43 +08:00
王怡栋 84ea957712 Merge branch 'master_xieqiyu_30834' into 'master'
* Fix bug#30834.

See merge request easycorp/zentaopms!6820
2023-02-01 06:28:30 +00:00
王怡栋 3c316330d1 Merge branch 'master_xieqiyu_30859' into 'master'
* Fix bug#30859.

See merge request easycorp/zentaopms!6819
2023-02-01 06:28:14 +00:00
王怡栋 fb0ffba7a2 Merge branch 'master_xieqiyu_31366' into 'master'
* Fix bug#31366.

See merge request easycorp/zentaopms!6818
2023-02-01 06:27:20 +00:00
王怡栋 a02b41962e Merge branch 'zentaopms284_wangyuting' into 'master'
* Adjust modal width.

See merge request easycorp/zentaopms!6815
2023-02-01 06:26:48 +00:00
王怡栋 0933b65d15 Merge branch 'zentaopms_284_task_#83032' into 'master'
* Finish task #83032.

See merge request easycorp/zentaopms!6813
2023-02-01 06:26:36 +00:00
tianshujie 36c76ee62f * Fix bug #28308. 2023-02-01 14:05:28 +08:00
tianshujie 43978561eb * Fix bug #30004. 2023-02-01 13:15:24 +08:00
xieqiyu aeb0d8054d * Fix bug#30834. 2023-02-01 11:13:11 +08:00
xieqiyu eb176697b1 * Fix bug#30859. 2023-02-01 10:48:48 +08:00
liuhong da4d42781d * Fix bug #30814 2023-02-01 02:09:36 +00:00
孙广明 c6a4775b7d Merge branch 'fixbug/liumengyi_fixbug' into 'master'
* Fix bug for empty password.

See merge request easycorp/zentaopms!6812
2023-02-01 01:54:09 +00:00
chaideqing 0ebc9cd0d3 * Fix feedback 2047. 2023-02-01 01:52:20 +00:00
xieqiyu d1d82a03fc * Fix bug#31366. 2023-02-01 09:43:57 +08:00
zhouxin c5570bf560 * Fix bug for feedback #2015. 2023-02-01 09:18:27 +08:00
wangyuting2 809ba4b43e * Adjust modal width. 2023-02-01 08:26:08 +08:00
daitingting eac10fe708 * Finish task #83032. 2023-01-31 09:19:02 +00:00
liumengyi bd86dca878 * Fix bug for empty password. 2023-01-31 16:31:51 +08:00
孙广明 ba7b473635 Merge branch 'zhouxin_feedback_2015' into 'master'
* Resolve feedback #2015.

See merge request easycorp/zentaopms!6805
2023-01-31 08:06:25 +00:00
liuyongkai 828244c433 * Resolve ticket #295. 2023-01-31 15:23:32 +08:00