 孙广明
|
fcd2ecc003
|
Merge branch 'bugfix/32954_liumengyi' into 'master'
* Fix bug #32954, #32992.
See merge request easycorp/zentaopms!7204
|
2023-03-16 02:34:07 +00:00 |
|
|
liumengyi
|
6c9f1435a0
|
* Fix bug #32992.
|
2023-03-16 02:32:00 +00:00 |
|
|
胡方舟
|
214f0fb814
|
Merge branch 'bugfix/liwenrui/sysadmin' into 'master'
* rename variables, avoiding duplicate variable names.
See merge request easycorp/zentaopms!7203
|
2023-03-16 02:25:19 +00:00 |
|
|
liumengyi
|
068784e472
|
* Fix bug #32954.
|
2023-03-16 02:17:48 +00:00 |
|
|
wangyidong
|
103ef2810c
|
* fix bug #32990.
|
2023-03-16 10:10:31 +08:00 |
|
|
wangyidong
|
4bcac4593a
|
* fix bug #32988.
|
2023-03-16 10:05:37 +08:00 |
|
|
Wenrui LI
|
f40589033b
|
* rename variables, avoiding duplicate variable names.
|
2023-03-16 09:24:09 +08:00 |
|
|
wangyidong
|
3c19d401a7
|
* adjust for save editor.
|
2023-03-15 17:26:22 +08:00 |
|
|
wangyidong
|
21ef127eea
|
* fix bug #32975.
|
2023-03-15 17:23:10 +08:00 |
|
|
王怡栋
|
fd5788438a
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7201
|
2023-03-15 09:20:39 +00:00 |
|
|
王怡栋
|
ee930f4cd9
|
Merge branch 'bugfix/32945_liumengyi' into 'master'
* Fix bug #32945.
See merge request easycorp/zentaopms!7200
|
2023-03-15 09:15:58 +00:00 |
|
|
王怡栋
|
1eca83bbb9
|
Merge branch 'bugfix/32640_liumengyi' into 'master'
* Fix bug #32640, #32618, #32465.
See merge request easycorp/zentaopms!7197
|
2023-03-15 09:15:43 +00:00 |
|
|
王怡栋
|
1cc835e08f
|
Merge branch 'sprint/scx_dropdimension' into 'master'
Sprint/scx dropdimension
See merge request easycorp/zentaopms!7202
|
2023-03-15 09:12:30 +00:00 |
|
|
宋辰轩
|
180c02755f
|
* Remove sql to 18-2.
|
2023-03-15 17:07:51 +08:00 |
|
|
宋辰轩
|
1e882e4a9c
|
* Remove sql to 18-3.
|
2023-03-15 17:02:16 +08:00 |
|
|
宋辰轩
|
da0fd20ff3
|
* Drop dimension.
|
2023-03-15 17:00:36 +08:00 |
|
|
liumengyi
|
f643f3bd93
|
* Fix bug #32945.
|
2023-03-15 08:44:01 +00:00 |
|
|
管西迎
|
6ff175d2f4
|
Merge branch 'sprint/hufangzhou_delete_dimension' into 'master'
- Remove the unused table.
See merge request easycorp/zentaopms!7199
|
2023-03-15 08:43:59 +00:00 |
|
|
wangyidong
|
990a5c35bd
|
* fix bug.
|
2023-03-15 16:38:48 +08:00 |
|
|
tianshujie
|
42bbd47348
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-15 16:20:59 +08:00 |
|
|
tianshujie
|
fd18f8b1d1
|
* Fix bug 32972.
|
2023-03-15 16:20:05 +08:00 |
|
|
caoyanyi
|
03be35acd9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-15 16:12:40 +08:00 |
|
|
tianshujie
|
e68579843f
|
* Fix bug 32965.
|
2023-03-15 15:55:49 +08:00 |
|
|
hufangzhou
|
5b033e8f42
|
* Remove the unused table.
|
2023-03-15 15:53:52 +08:00 |
|
|
tianshujie
|
a051e5b3ff
|
Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-15 15:41:11 +08:00 |
|
|
tianshujie
|
a30fed01fa
|
* Fix bug 32942.
|
2023-03-15 15:40:57 +08:00 |
|
|
王怡栋
|
bb6a06042b
|
Merge branch 'dev/gfl_fix_bug' into 'master'
* Adjust code for func saveFormDraft .
See merge request easycorp/zentaopms!7198
|
2023-03-15 07:37:52 +00:00 |
|
|
wangyidong
|
ce9340aef8
|
* fix bug #32946.
|
2023-03-15 15:36:16 +08:00 |
|
|
guofeilong
|
3ee164eb6a
|
* Adjust code for func saveFormDraft .
|
2023-03-15 15:34:42 +08:00 |
|
|
caoyanyi
|
39a55e9808
|
* Code for bug #32955.
|
2023-03-15 15:27:11 +08:00 |
|
|
tianshujie
|
0964904dda
|
* Fix bug 32952.
|
2023-03-15 15:23:57 +08:00 |
|
|
liumengyi
|
ee56283107
|
* Fix bug #32465.
|
2023-03-15 07:17:32 +00:00 |
|
|
liumengyi
|
6fc0fd1867
|
* Fix bug #32618.
|
2023-03-15 06:59:37 +00:00 |
|
|
caoyanyi
|
3664c16234
|
* Skip form stash for devops.
|
2023-03-15 14:54:56 +08:00 |
|
|
tianshujie
|
56c5942ddf
|
* Fix bug 32948.
|
2023-03-15 14:39:22 +08:00 |
|
|
liumengyi
|
19fe5417de
|
* Fix bug #32640.
|
2023-03-15 06:34:32 +00:00 |
|
|
wangyidong
|
5729bb2f7e
|
Merge branch 'tsj_fixbug'
|
2023-03-15 14:20:00 +08:00 |
|
|
王怡栋
|
f526a16291
|
Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
# module/custom/lang/zh-cn.php
|
2023-03-15 06:19:32 +00:00 |
|
|
管西迎
|
39847e1cf5
|
Merge branch 'sprint/hufangzhou_bug_32940' into 'master'
* Fix bug #32940.
See merge request easycorp/zentaopms!7196
|
2023-03-15 06:17:38 +00:00 |
|
|
hufangzhou
|
047dfd6e54
|
* Fix bug #32940.
|
2023-03-15 14:09:10 +08:00 |
|
|
孙广明
|
41538eb1db
|
Merge branch 'feature/38477' into 'master'
* Fix bug of task #87014.
See merge request easycorp/zentaopms!7190
|
2023-03-15 05:38:41 +00:00 |
|
|
wangyidong
|
ede15c92db
|
* fix for upgrade for editor module.
|
2023-03-15 13:08:05 +08:00 |
|
|
管西迎
|
d0817bc8a0
|
Merge branch 'hufangzhou_newVersion' into 'master'
* Add 18.3 version.
See merge request easycorp/zentaopms!7193
|
2023-03-15 03:10:17 +00:00 |
|
|
tianshujie
|
07e2128147
|
* Modify program language.
|
2023-03-15 11:02:06 +08:00 |
|
|
tianshujie
|
445323e278
|
* Modify product line language.
|
2023-03-15 11:00:45 +08:00 |
|
|
tianshujie
|
c513f5cb95
|
* Modify product line language.
|
2023-03-15 10:59:36 +08:00 |
|
|
tianshujie
|
5f6f52e86e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-03-15 10:57:18 +08:00 |
|
|
tianshujie
|
dc8fdfb263
|
* Modify product line language.
|
2023-03-15 10:56:13 +08:00 |
|
|
管西迎
|
93ca7dda5f
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug 32911.
See merge request easycorp/zentaopms!7192
|
2023-03-15 02:55:12 +00:00 |
|
|
tianshujie
|
bdc83c7088
|
* Modify product line language.
|
2023-03-15 10:54:45 +08:00 |
|