Commit Graph
43550 Commits
Author SHA1 Message Date
liumengyi 8dc2999075 * Fix bug #26379. 2022-08-12 15:44:01 +08:00
liumengyi f540e58388 * Fix bug. 2022-08-12 14:25:29 +08:00
liumengyi 698510fadf * Fix bug #26325. 2022-08-12 13:13:38 +08:00
liumengyi c5522146da * Fix bug #26325. 2022-08-12 13:12:56 +08:00
刘刚 d6c7e4e50d Merge branch 'sprint/devplat_31' into 'master'
* Fix bug #22376.

See merge request easycorp/zentaopms!4939
2022-08-12 02:58:15 +00:00
王怡栋 9e8fddafa6 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4943
2022-08-12 00:49:55 +00:00
王怡栋 1c95b63d7b Merge branch 'importExport' into 'master'
* Format code for port.

See merge request easycorp/zentaopms!4944
2022-08-12 00:49:44 +00:00
zhouxudong 21866db309 * Fix bug. 2022-08-12 00:46:07 +00:00
tanghucheng baf02b5fe3 * Format code for port. 2022-08-12 08:42:01 +08:00
wangyidong 1d1379392a * adjust for merge program. 2022-08-12 08:34:37 +08:00
王怡栋 f1e13457e5 Merge branch 'sprint224_zg_26307' into 'master'
* Fix bug #26307

See merge request easycorp/zentaopms!4931
2022-08-12 00:31:55 +00:00
王怡栋 2f2718e409 Merge branch 'sprint/224_hufangzhou_changelog' into 'master'
* Modify the changelog.

See merge request easycorp/zentaopms!4941
2022-08-12 00:28:58 +00:00
王怡栋 6c24a5aad1 Merge branch 'importExport' into 'master'
* Code for port.

See merge request easycorp/zentaopms!4942
2022-08-12 00:28:44 +00:00
孙广明 77b27f5eb3 Merge branch 'lyk_fixbug' into 'master'
* Fix bug of the view of admin in lite

See merge request easycorp/zentaopms!4929
2022-08-12 00:14:12 +00:00
tanghucheng 3a72c09b5c * Code for port. 2022-08-12 00:34:10 +08:00
hufangzhou 3fb7a8b070 * Modify the changelog. 2022-08-11 18:59:08 +08:00
王怡栋 d99af116f9 Merge branch 'importExport' into 'master'
* Fix bug #26324.

See merge request easycorp/zentaopms!4937
2022-08-11 09:00:13 +00:00
李玉春 00e410cce8 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!4940
2022-08-11 08:59:48 +00:00
tanghucheng 81f8cdcd6d * Fix bug #26336. 2022-08-11 16:55:30 +08:00
zhouxudong 7826781cff * Fix bug. 2022-08-11 08:53:49 +00:00
liugang c1f71409f8 * Fix bug #22376. 2022-08-11 16:49:59 +08:00
tanghucheng dd3e5483d4 * Fix bug #26324. 2022-08-11 16:41:39 +08:00
王怡栋 af417a81fb Merge branch 'sprint/unitteest_liumengyi_build' into 'master'
* Fix unit test of build.

See merge request easycorp/zentaopms!4935
2022-08-11 08:21:13 +00:00
王怡栋 df6dbae7eb Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
remove image

See merge request easycorp/zentaopms!4934
2022-08-11 08:20:29 +00:00
王怡栋 15d3c5f680 Merge branch 'sprint/224_dongli_bug63665' into 'master'
* Fix bug #63665.

See merge request easycorp/zentaopms!4933
2022-08-11 08:20:16 +00:00
王怡栋 821f011e90 Merge branch 'importExport' into 'master'
* Code for port.

See merge request easycorp/zentaopms!4932
2022-08-11 08:04:27 +00:00
李玉春 cfa6b03e8e Merge branch 'cyy_bug' into 'master'
* Modify mr error.

See merge request easycorp/zentaopms!4936
2022-08-11 08:00:47 +00:00
caoyanyi 0e6bc3432e * Modify mr error. 2022-08-11 15:59:51 +08:00
tanghucheng 0562051edc Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-11 15:57:07 +08:00
liumengyi 951a5a0ca4 * Fix unit test of build. 2022-08-11 15:50:42 +08:00
lanzongjun 47de689c2e remove image 2022-08-11 15:47:48 +08:00
dongli 4597794f91 * Fix bug #63665. 2022-08-11 07:37:20 +00:00
tanghucheng ff0ee876f0 * Code for port. 2022-08-11 15:36:26 +08:00
wangyidong 02bab0a206 Merge branch 'sprint/devplat_31' 2022-08-11 15:21:36 +08:00
liuyongkai 3d5f702b1e * Fix bug of kanban and the view of admin in lite 2022-08-11 07:19:07 +00:00
daitingting 5f9da4f6ec * Adjust upgrade version. 2022-08-11 07:17:44 +00:00
zenggang 6600b76ad9 * Fix bug #26307 2022-08-11 07:01:08 +00:00
daitingting 145b7d2bc5 * Update defalut likages for approval review. 2022-08-11 06:57:44 +00:00
liuyongkai fe65aba0de * Fix bug of the view of admin in lite 2022-08-11 06:41:57 +00:00
wangyidong 1915ef01e5 * fix for get plans when no product. 2022-08-11 14:21:22 +08:00
wangyidong d4ed167e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-08-11 14:12:52 +08:00
wangyidong 579d614d77 Merge branch 'sprint/devplat_31' 2022-08-11 14:12:44 +08:00
王怡栋 0125b85cd4 Merge branch 'sprint/master_guofeilong_fixbug_261443' into 'master'
Sprint/master guofeilong fixbug 261443

See merge request easycorp/zentaopms!4925
2022-08-11 06:00:45 +00:00
liuruogu 64acdb8693 * Fix bug #26173. 2022-08-11 05:53:27 +00:00
guofeilong 25444755d3 * Delete debugger 2022-08-11 05:51:42 +00:00
guofeilong 04c79e6fbb * Fix bug #26143 2022-08-11 05:49:24 +00:00
liuruogu 5a6d41baed * Fix bug #26173. 2022-08-11 05:47:19 +00:00
sunguangming a978f21f69 * Fix file unit case. 2022-08-11 13:31:51 +08:00
sunguangming 17c5bdca14 * Add unit case for file. 2022-08-11 13:21:50 +08:00
王怡栋 61f3904ff0 Merge branch 'sprint/devplat_31' into 'master'
* Add flow fields when upgrade from biz7.3.

See merge request easycorp/zentaopms!4922
2022-08-11 05:20:51 +00:00