Commit Graph
50565 Commits
Author SHA1 Message Date
tanghucheng b295a994e4 * Fix bug #26718. 2023-02-02 09:13:45 +08:00
tanghucheng 61c09d7c32 * Fix bug #29989. 2023-02-02 08:43:52 +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
孙广明 33c29fb324 Merge branch 'lyk_ticket_2072' into 'master'
* Resolve ticket #2072.

See merge request easycorp/zentaopms!6828
2023-02-01 08:39:40 +00:00
liuyongkai 3dfb278fc4 * Resolve ticket #2072. 2023-02-01 16:37:24 +08:00
孙广明 beec1cc222 Merge branch 'lyk_ticket_2072' into 'master'
* Resolve ticket #2072.

See merge request easycorp/zentaopms!6827
2023-02-01 08:35:42 +00: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
孙广明 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
孙广明 5e1ef2f376 Merge branch 'zhouxin_feedback_fixbugs' into 'master'
* Fix bug for feedback #2015.

See merge request easycorp/zentaopms!6816
2023-02-01 01:54:02 +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
孙广明 ba9dbce86b Merge branch 'lyk_ticket_295' into 'master'
* Resolve ticket #295.

See merge request easycorp/zentaopms!6811
2023-01-31 08:05:49 +00:00
liuyongkai 828244c433 * Resolve ticket #295. 2023-01-31 15:23:32 +08:00
孙广明 45d23ceddf Merge branch 'lyk_fix' into 'master'
* Remove error commited file.

See merge request easycorp/zentaopms!6810
2023-01-31 06:12:16 +00:00
liuyongkai b05c2d6dae * Remove error commited file. 2023-01-31 14:10:16 +08:00
朱金勇 f2b5b5cd42 Merge branch 'fix/typo' into 'master'
* Fix typo.

See merge request easycorp/zentaopms!6779
2023-01-31 05:59:58 +00:00
王怡栋 f0f2784b42 Merge branch 'zentaopms284_bug#77615' into 'master'
* Fix bug #77615.

See merge request easycorp/zentaopms!6808
2023-01-31 03:18:38 +00:00
王怡栋 8e40414917 Merge branch 'master_bug_30389' into 'master'
* Adjust code logic for 30389.

See merge request easycorp/zentaopms!6807
2023-01-31 03:18:20 +00:00
王怡栋 b584104430 Merge branch 'sprint/hidedropmenu' into 'master'
* Hide drop-down menu when click one item.

See merge request easycorp/zentaopms!6806
2023-01-31 03:18:03 +00:00
wangyuting2 93441fab71 * Fix bug #77615. 2023-01-31 10:20:25 +08:00
liuhong 40ca0b3f77 * Adjust code logic for 30389. 2023-01-31 01:38:33 +00:00
zhouxin d207715804 * Resolve feedback #2015. 2023-01-31 09:02:38 +08:00
王怡栋 27d762ff59 Merge branch 'zentaopms284_wangyuting' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!6803
2023-01-31 00:48:35 +00:00
wangyuting2 b4efdef521 * Optimize code. 2023-01-31 08:25:31 +08:00