Commit Graph
46103 Commits
Author SHA1 Message Date
王怡栋 e8653dbdde Merge branch 'zentaopms_239_task_#71573' into 'zentaopms_239'
* Finish task #71573.

See merge request easycorp/zentaopms!5839
2022-10-20 08:09:43 +00:00
daitingting 90701e792b * Finish task #71573. 2022-10-20 07:53:20 +00:00
王 于听 9a4e80030b Merge branch 'zentaopms_239_taask#71570' into 'zentaopms_239'
* Fix bug.

See merge request easycorp/zentaopms!5837
2022-10-20 07:53:02 +00:00
wangyuting2 24b46a9cdc * Fix bug. 2022-10-20 07:52:23 +00:00
wangyidong 986ca160d1 * fix bug #28739. 2022-10-20 15:25:47 +08:00
王 于听 b46134152d Merge branch 'zentaopms_239_task#71570' into 'zentaopms_239'
* Finish task #71570.

See merge request easycorp/zentaopms!5831
2022-10-20 06:56:59 +00:00
wangyuting2 f94effc9e3 * Fix bug. 2022-10-20 06:27:27 +00:00
wangyuting2 decff18c2a * Finish task #71570. 2022-10-20 06:11:00 +00:00
wangyidong 9031aac218 * fix for print divider in three level navigation. 2022-10-20 13:39:26 +08:00
Yagami 19e1301ffd Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-20 13:22:49 +08:00
Yagami 646dcaec32 * Finish task #72677. 2022-10-20 13:22:07 +08:00
wangyidong 723b0a02e1 * code for task #72778. 2022-10-20 11:26:12 +08:00
王怡栋 22900e1c13 Merge branch 'zentaopms_239_task_#71572' into 'zentaopms_239'
* Finish task #71572.

See merge request easycorp/zentaopms!5819
2022-10-20 02:53:35 +00:00
王怡栋 3ae9ef68b2 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Fix bug.

See merge request easycorp/zentaopms!5816
2022-10-20 02:53:02 +00:00
Yagami 382b200985 * Code for task #72675. 2022-10-20 10:29:33 +08:00
Yagami 03fe10a21c * Finish task #72675. 2022-10-20 10:07:48 +08:00
daitingting 6750bed454 * Finish task #71572. 2022-10-20 01:41:01 +00:00
wangyuting2 aebe15c2ad * Fix bug. 2022-10-20 00:54:13 +00:00
wangyidong 9719597cbf * adjust for my audit. 2022-10-19 17:27:09 +08:00
Yagami 58c2a977e0 * Finish task #72676. 2022-10-19 16:17:04 +08:00
Yagami b4bdcd0ca3 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-19 15:36:28 +08:00
Yagami 187d3b8ca4 * Finish task #72674. 2022-10-19 15:36:15 +08:00
王怡栋 cbe90e98b1 Merge branch 'zentaopms_239_task_#71571' into 'zentaopms_239'
* Finish task #71571.

See merge request easycorp/zentaopms!5804
2022-10-19 06:22:21 +00:00
daitingting 378c8309f5 * Finish task #71571. 2022-10-19 06:12:05 +00:00
王怡栋 e0b6c4e2d4 Merge branch 'zentaopms_239_task#72774' into 'zentaopms_239'
* Finish task #72774.

See merge request easycorp/zentaopms!5803
2022-10-19 06:10:33 +00:00
wangyuting2 d71b81c9cb * Finish task #72774. 2022-10-19 06:07:55 +00:00
王怡栋 71e67eb474 Merge branch 'zentaopms_239_task#72773' into 'zentaopms_239'
* Finish task #72773.

See merge request easycorp/zentaopms!5799
2022-10-19 05:52:47 +00:00
wangyuting2 ecaff099cd * Finish task #72773. 2022-10-19 05:45:15 +00:00
王怡栋 447de92311 Merge branch 'zentaopms_239_task#72775' into 'zentaopms_239'
* Finish task #72775.

See merge request easycorp/zentaopms!5797
2022-10-19 05:31:18 +00:00
王怡栋 15125e7cd1 Merge branch 'zentaopms_239_task#72763' into 'zentaopms_239'
* Finish task #72763 ~ #72772.

See merge request easycorp/zentaopms!5792
2022-10-19 05:27:22 +00:00
王怡栋 71a7e568da Merge branch 'zentaopms_239_task_#71568' into 'zentaopms_239'
* Finish task #71568.

See merge request easycorp/zentaopms!5791
2022-10-19 05:25:28 +00:00
wangyuting2 5182cf2d42 * Finish task #72775. 2022-10-19 05:20:12 +00:00
Yagami c330b6bc06 * Finish task #72673. 2022-10-19 13:07:04 +08:00
wangyuting2 49901fd7f9 * Finish task #72763 ~ #72772. 2022-10-19 03:03:59 +00:00
daitingting 6948b02a8c * Finish task #71568. 2022-10-19 03:01:18 +00:00
Yagami b3d6998ed8 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-19 10:48:48 +08:00
Yagami 33bb2e6082 * Finish task #72672. 2022-10-19 10:47:30 +08:00
李玉春 9fe46c4e69 Merge branch 'zentaopms_239_wangjianhua_70793' into 'zentaopms_239'
* Fix undefined variable.

See merge request easycorp/zentaopms!5790
2022-10-19 02:11:18 +00:00
wangjianhua 175e39da1b * Fix undefined variable. 2022-10-19 10:01:21 +08:00
李玉春 a7c7185f56 Merge branch 'zentaopms_239_wangjianhua_70793' into 'zentaopms_239'
* Rebuild linking repo and project without product.

See merge request easycorp/zentaopms!5788
2022-10-19 01:26:52 +00:00
Yagami de225ca01f Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-19 09:24:15 +08:00
Yagami 6788ef5793 * Finish task #72671. 2022-10-19 09:23:59 +08:00
wangjianhua b27e504f4c * Adjust codes format. 2022-10-19 09:19:57 +08:00
wangjianhua 42d8122e7a * Add lang items. 2022-10-19 08:51:08 +08:00
王怡栋 e95ab64e36 Merge branch 'zentaopms_239_task_#72258' into 'zentaopms_239'
* Finish task #72258.

See merge request easycorp/zentaopms!5776
2022-10-19 00:31:44 +00:00
wangjianhua 31b013007c * Rebuild linking repo and project without product. 2022-10-19 00:28:21 +08:00
daitingting 9cfdad38f4 * Remove debug codes. 2022-10-18 07:44:12 +00:00
王怡栋 d1e4de9265 Merge branch 'zentaopms_239_task#72762' into 'zentaopms_239'
* Finish task #72762.

See merge request easycorp/zentaopms!5781
2022-10-18 07:38:11 +00:00
王怡栋 82bd6185cf Merge branch 'zentaopms_239_task#71642' into 'zentaopms_239'
* Finish task #71642.

See merge request easycorp/zentaopms!5779
2022-10-18 07:36:44 +00:00
王怡栋 a5c089f3c2 Merge branch 'zentaopms_239_task#71635' into 'zentaopms_239'
* Finish task #71635.

See merge request easycorp/zentaopms!5777
2022-10-18 07:36:14 +00:00