Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
44,958 Commits 2 Branches 292 Tags
7c1c2b6819cef9c7d6a60bccbbbb5ece58ecfb93
Commit Graph
44958 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
刘刚 7c1c2b6819 Merge branch 'sprint/243_liugang_fixbug_27572' into 'zentaopms_239' 
* Fix bug #27572.

See merge request easycorp/zentaopms!5414
 2022-09-19 09:37:41 +00:00
liugang 47ccd4895c * Fix bug #27572. 2022-09-19 17:21:44 +08:00
刘刚 41bcd48905 Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239' 
* Finish task #69594.

See merge request easycorp/zentaopms!5412
 2022-09-19 09:03:52 +00:00
tanghucheng 187a310622 * Fix function annotations for product. 2022-09-19 17:00:08 +08:00
tanghucheng d8e0bae8c8 * Finish task #69594. 2022-09-19 16:56:30 +08:00
刘刚 9b5823c7a3 Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239' 
* Fix bug #27570.

See merge request easycorp/zentaopms!5411
 2022-09-19 08:38:20 +00:00
孙广明 e588819158 Merge branch 'sgm_69020' into 'zentaopms_239' 
Sgm 69020

See merge request easycorp/zentaopms!5410
 2022-09-19 08:37:38 +00:00
sunguangming ebe4a88493 * Finish task #69020. 2022-09-19 16:36:48 +08:00
liuruogu bfccfd4f79 * Fix bug #27570. 2022-09-19 08:33:05 +00:00
刘刚 7418dca876 Merge branch 'sprint/243_liugang_fixbug_27562' into 'zentaopms_239' 
* Fix bug #27562.

See merge request easycorp/zentaopms!5409
 2022-09-19 08:31:40 +00:00
liugang 15f3ec081b * Fix bug #27562. 2022-09-19 16:30:49 +08:00
刘刚 616710244f Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239' 
* Fix bug #27553, #27529.

See merge request easycorp/zentaopms!5407
 2022-09-19 08:26:53 +00:00
liuruogu 77e034b529 * Fix bug #27539. 2022-09-19 08:18:53 +00:00
liuruogu 7eae1eebcb * Fix bug #27553, #27529. 2022-09-19 08:15:07 +00:00
liuruogu e72832edbc * Fix bug #27553, #27529. 2022-09-19 08:13:23 +00:00
刘刚 29fe14994c Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239' 
* Fix bug #27527.

See merge request easycorp/zentaopms!5404
 2022-09-19 07:47:47 +00:00
刘刚 c39ec62541 Merge branch 'sprint/243_liugang_69599' into 'zentaopms_239' 
* Finish task #69599.

See merge request easycorp/zentaopms!5405
 2022-09-19 07:37:32 +00:00
liuruogu a0d2e6517b * Fix bug #27527. 2022-09-19 07:37:07 +00:00
liugang 807952f921 * Finish task #69599. 2022-09-19 15:36:40 +08:00
刘刚 8cd93ece3f Merge branch 'sprint/243_liugang_69599' into 'zentaopms_239' 
* Finish task #69599.

See merge request easycorp/zentaopms!5402
 2022-09-19 07:33:11 +00:00
liuruogu a54510b47f * Fix bug #27527. 2022-09-19 07:31:29 +00:00
liugang 2bbf63e9dc * Finish task #69599. 2022-09-19 15:25:17 +08:00
sunguangming 404f87c73d * Finish task #69020. 2022-09-19 14:55:56 +08:00
刘刚 e1a2cff925 Merge branch 'sprint/243_liugang_69598' into 'zentaopms_239' 
Finish task #69598

See merge request easycorp/zentaopms!5400
 2022-09-19 06:51:08 +00:00
刘刚 48095b725a Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239' 
* Fix bug #27502.

See merge request easycorp/zentaopms!5397
 2022-09-19 06:50:59 +00:00
liugang ac9137864f * Finish task #69598. 2022-09-19 14:46:49 +08:00
liugang 24968b1f19 * Optimize. 2022-09-19 14:45:54 +08:00
liuruogu c41c562767 * Fix bug for menu. 2022-09-19 06:45:18 +00:00
liuruogu 8d22d737ea * Fix bug #27502. 2022-09-19 06:10:21 +00:00
tanghucheng 50fd50bfa0 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239_tanghucheng 2022-09-19 13:57:00 +08:00
刘刚 06d630ad51 Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239' 
* Finish task #69017.

See merge request easycorp/zentaopms!5392
 2022-09-19 05:49:25 +00:00
liuruogu 5734da37c5 * Finish task #69017. 2022-09-19 05:39:51 +00:00
tanghucheng d34a4dc75c Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239_tanghucheng 2022-09-19 13:22:04 +08:00
刘刚 8579209d6a Merge branch 'sprint/243_liugang_69005' into 'zentaopms_239' 
* Finish task #69005.

See merge request easycorp/zentaopms!5389
 2022-09-19 03:13:14 +00:00
liugang a51e63ab52 * Finish task #69005. 2022-09-19 10:56:54 +08:00
tanghucheng 330440a98a Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239_tanghucheng 2022-09-19 10:51:20 +08:00
刘刚 2c85588d1a Merge branch 'sprint/239_liuruogu_task#69017' into 'zentaopms_239' 
* Finish task #69017.

See merge request easycorp/zentaopms!5387
 2022-09-19 02:02:08 +00:00
liuruogu 11d08e8620 * Finish task #69103. 2022-09-19 01:43:12 +00:00
liuruogu d7f589a54c * Finish task #69017. 2022-09-19 00:55:59 +00:00
tanghucheng fb7d1a2cf0 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239_tanghucheng 2022-09-19 08:45:23 +08:00
刘刚 650805cf35 Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239' 
* Finish task #69004.

See merge request easycorp/zentaopms!5381
 2022-09-16 08:53:54 +00:00
tanghucheng b76884abcf Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239_tanghucheng 2022-09-16 16:23:21 +08:00
tanghucheng 30ad85c622 * Finish task #69004. 2022-09-16 16:11:55 +08:00
liuruogu cfc214c776 * Finish task #69017. 2022-09-16 07:42:20 +00:00
王怡栋 5494fbfaec Merge branch 'zentaopms_239_tanghucheng' into 'zentaopms_239' 
* Fix bug for common lang.

See merge request easycorp/zentaopms!5374
 2022-09-16 05:38:16 +00:00
tanghucheng ebeb74af0f * * Fix bug for common lang. 2022-09-16 13:36:40 +08:00
tanghucheng de7af4bec4 Merge branch 'zentaopms_239_tanghucheng_69006' into zentaopms_239 2022-09-16 13:25:14 +08:00
唐胡成 960e138526 Merge branch 'zentaopms_239' into 'zentaopms_239_tanghucheng' 
# Conflicts:
#   module/common/lang/en.php
#   module/common/lang/fr.php
#   module/common/lang/menu.php
 2022-09-16 05:21:43 +00:00
tanghucheng 14dd9807e9 * Finish task #69006. 2022-09-16 13:13:26 +08:00
刘刚 78dd40f73a Merge branch 'sprint/239_liugang_68997' into 'zentaopms_239' 
* Finish task #68997.

See merge request easycorp/zentaopms!5371
 2022-09-16 03:59:49 +00:00