Commit Graph
52230 Commits
Author SHA1 Message Date
孙广明 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
王怡栋 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
caoyanyi 75017cb302 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-08 09:31:53 +08:00
caoyanyi 6ac75ed33c * Modify project common lang. 2023-03-08 09:31:31 +08:00
孙广明 aa43899adf Merge branch 'sprint/fixbug_liumengyi_31827' into 'master'
* Fix bug #31827.

See merge request easycorp/zentaopms!7151
2023-03-08 01:27:19 +00:00
孙广明 429661db3b Merge branch 'zentaopms_289' into 'master'
Zentaopms 289

See merge request easycorp/zentaopms!7150
2023-03-08 01:26:34 +00:00
孙广明 02040ed365 Merge branch 'mayue_resolve_feedback#2393' into 'master'
* Fix feedback #2393.

See merge request easycorp/zentaopms!7146
2023-03-08 01:25:41 +00:00
孙广明 08a56aa814 Merge branch 'sprint/294_liumengyi_85646' into 'master'
* Finish task #85646.

See merge request easycorp/zentaopms!7144
2023-03-08 01:25:24 +00:00
孙广明 59c05f91c7 Merge branch 'fixbug_liumengyi_32633' into 'master'
* Fix bug 32603 32632 32633.

See merge request easycorp/zentaopms!7142
2023-03-08 01:24:54 +00:00
tianshujie a67515ae02 * Modify language items for project common. 2023-03-08 09:21:58 +08:00
tianshujie 4ac15934cd * Modify language items for project common. 2023-03-08 08:53:44 +08:00
tianshujie ef66a11475 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-08 08:50:17 +08:00
tianshujie d650f56116 * Restore code. 2023-03-08 08:49:47 +08:00
tianshujie 1d6825f5b6 * Modify language items for project,product common. 2023-03-07 17:03:52 +08:00
tianshujie 771614b24e Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-07 16:38:18 +08:00
tianshujie cecb8315ac * Modify language items for product,project common. 2023-03-07 16:34:48 +08:00
caoyanyi 33a4928c82 * Adjust code. 2023-03-07 16:19:09 +08:00