Commit Graph
52245 Commits
Author SHA1 Message Date
wangyidong f99fba7c50 * fix bug. 2023-03-09 14:12:13 +08:00
wangyidong 7ed3f67bb5 * fix bug for php 5.6. 2023-03-09 14:01:58 +08:00
wangyidong 4549e19e5d * adjust for editor. 2023-03-09 11:30:39 +08:00
wangyidong 99f54fc955 * fix bug #32738. 2023-03-09 10:54:41 +08:00
孙广明 7e917498bf Merge branch 'lyk_fixbug' into 'master'
* Fix undefined variable.

See merge request easycorp/zentaopms!7160
2023-03-09 01:52:51 +00:00
liuyongkai f69af0f62c * Fix undefined variable. 2023-03-09 09:50:51 +08:00
liuyongkai a71560aa80 * Fix undefined variable. 2023-03-09 09:47:01 +08:00
王怡栋 eb72039581 Merge branch 'cyy_bug' into 'master'
* Fix bug #28114.

See merge request easycorp/zentaopms!7159
2023-03-09 01:46:26 +00:00
caoyanyi 3c40d95b62 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_bug 2023-03-09 09:44:55 +08:00
liuyongkai 7e8b3cceb4 * Fix undefined variable. 2023-03-09 09:42:25 +08:00
孙广明 100b668d66 Merge branch 'wxp_bug86289' into 'master'
Fix bug #86289.

See merge request easycorp/zentaopms!7149
2023-03-09 01:33:34 +00:00
孙广明 a46387b590 Merge branch 'sprint/295_liumengyi_85648' into 'master'
* Finish task #85648.

See merge request easycorp/zentaopms!7155
2023-03-09 01:33:19 +00:00
caoyanyi eeafdf7671 * Revmoe console code. 2023-03-08 17:18:26 +08:00
caoyanyi 7e5fc5ade4 * Code for bug #28726. 2023-03-08 17:11:44 +08:00
caoyanyi e409352d47 * Code for bug #28726. 2023-03-08 17:09:27 +08:00
caoyanyi beaa4768b1 * Fix bug #28726. 2023-03-08 17:06:31 +08:00
caoyanyi 1364c7923b * Fix bug #28114. 2023-03-08 16:41:51 +08:00
王怡栋 4b10b5abeb Merge branch 'sprint/tsj_case' into 'master'
* Modify menu tree.

See merge request easycorp/zentaopms!7157
2023-03-08 08:26:46 +00:00
王怡栋 46601ba53e Merge branch 'dev/gfl_handleSaveFormDraft_refactors' into 'master'
* Adjust code for handleSaveFormDraft .

See merge request easycorp/zentaopms!7158
2023-03-08 08:26:25 +00:00
guofeilong 1edf4259a4 * Adjust code for handleSaveFormDraft . 2023-03-08 16:25:18 +08:00
caoyanyi d5c74fe0aa * Modify menu tree. 2023-03-08 14:41:38 +08:00
王怡栋 623a7ef7e7 Merge branch 'sprint/tsj_case' into 'master'
* Modify case of dev module.

See merge request easycorp/zentaopms!7156
2023-03-08 05:57:08 +00:00
caoyanyi 6ffc053bcf * Modify tag lang menu tree. 2023-03-08 13:50:38 +08:00
tianshujie b317cd89a5 * Modify case of dev module. 2023-03-08 13:23:51 +08:00
liumengyi e5c211bf86 * Finish task #85648. 2023-03-08 03:24:46 +00:00
孙广明 58b175c453 Merge branch 'zentaopms_289' into 'master'
Zentaopms 289

See merge request easycorp/zentaopms!7154
2023-03-08 03:17:47 +00:00
caoyanyi afee92dcf3 * Update block name. 2023-03-08 11:14:02 +08:00
caoyanyi 9f3a92179c * Adjust code. 2023-03-08 11:10:31 +08:00
孙广明 7ec8ece76a Merge branch 'wxp_bug86288' into 'master'
* Fixed #bug86288.

See merge request easycorp/zentaopms!7153
2023-03-08 02:43:45 +00:00
caoyanyi 258ca0a739 * Update project common lang. 2023-03-08 10:41:05 +08:00
wangxuepeng 01481058b2 Fix bug #86289. 2023-03-08 02:40:26 +00:00
caoyanyi c2d21c9748 * Update project common lang. 2023-03-08 10:40:22 +08:00
wangxuepeng 4db7af7e52 * Fixed #bug86288. 2023-03-08 02:37:40 +00:00
caoyanyi c96040e1dd * Update project common lang. 2023-03-08 10:35:00 +08:00
caoyanyi 490d001153 * Update project common lang. 2023-03-08 10:34:12 +08:00
wangxuepeng 21c915dc36 * Fixed #bug86288. 2023-03-08 02:33:35 +00:00
caoyanyi a18a7560cf * Modify project common lang. 2023-03-08 10:30:52 +08:00
caoyanyi 6d4d57ab92 * Update product common lang. 2023-03-08 10:15:08 +08:00
caoyanyi 30a9f27446 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-08 10:12:27 +08:00
caoyanyi d95f23ee8b * Update product common lang. 2023-03-08 10:12:11 +08:00
guofeilong c35e4d97a6 * Adjust code for handleSaveFormDraft . 2023-03-08 10:11:44 +08:00
caoyanyi cea165d8bb * Update product common lang. 2023-03-08 10:06:49 +08:00
caoyanyi f0062da115 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-08 09:58:46 +08:00
caoyanyi 2e35bcb624 * Update project common lang. 2023-03-08 09:58:33 +08:00
tianshujie b52d4d4171 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-08 09:51:51 +08:00
tianshujie f9fdc67892 * Modify language items for project,product common. 2023-03-08 09:51:30 +08:00
caoyanyi eeae074475 * Update project common lang. 2023-03-08 09:46:27 +08:00
tianshujie 44b97bdab1 * Modify language items for project,product common. 2023-03-08 09:44:16 +08:00
caoyanyi 624c2cc1e3 * Update project common lang. 2023-03-08 09:39:50 +08:00
caoyanyi 6e7c9e25e8 * Update project common lang. 2023-03-08 09:36:56 +08:00