Commit Graph

52316 Commits

Author SHA1 Message Date
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
caoyanyi
a951a96350 * Update project common lang. 2023-03-07 16:12:53 +08:00
caoyanyi
234347cede * Update project common language. 2023-03-07 15:58:38 +08:00
wangxuepeng
76016e1b78 * Fixed #bug86288. 2023-03-07 07:43:26 +00:00
caoyanyi
1328ae82bc * Update project common language. 2023-03-07 15:38:49 +08:00
王怡栋
bbe621233f Merge branch 'dev/gfl_zui_css_refactors' into 'master'
* Code for zui: css refactors .

See merge request easycorp/zentaopms!7152
2023-03-07 07:37:23 +00:00
guofeilong
0185b7df0b * Code for zui: css refactors . 2023-03-07 15:28:41 +08:00
tianshujie
ea9b8a1406 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-07 15:03:07 +08:00
tianshujie
2c07064619 * Modify language items for product common. 2023-03-07 15:02:47 +08:00
wangyidong
8f92237880 * code for editor unit test. 2023-03-07 15:02:29 +08:00
tianshujie
5cf439e0e7 * Modify language items for product common. 2023-03-07 14:58:20 +08:00
caoyanyi
a646532bcb * Add test case. 2023-03-07 14:56:59 +08:00
liumengyi
b25022e3b0 * Fix bug #31827. 2023-03-07 06:52:09 +00:00
caoyanyi
b9fc578dd7 * Adjust codes. 2023-03-07 14:43:04 +08:00
caoyanyi
056f6a2414 * Optimize codes. 2023-03-07 14:00:03 +08:00
tianshujie
661cd28506 * Modify language items for product common. 2023-03-07 13:52:47 +08:00
tianshujie
99f3ccee79 * Modify language item for product common. 2023-03-07 13:49:20 +08:00