tianshujie
|
32686d7132
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-04-20 15:29:33 +08:00 |
|
tianshujie
|
205327d891
|
* Fixed dynamic error reporting.
|
2023-04-20 15:28:45 +08:00 |
|
刘刚
|
1d45e86bda
|
Merge branch 'tsj_fixbug' into 'master'
Tsj fixbug
See merge request easycorp/zentaopms!7503
|
2023-04-20 07:17:03 +00:00 |
|
刘刚
|
688aabd72f
|
Merge branch 'sprint/scx_modifygroup' into 'master'
* Modify chart group and dimension lang.
See merge request easycorp/zentaopms!7502
|
2023-04-20 07:16:41 +00:00 |
|
tianshujie
|
a139d7f622
|
* Modified quick page document navigation.
|
2023-04-20 15:02:53 +08:00 |
|
wangyidong
|
a8f88d0178
|
* fix bug #33393.
|
2023-04-20 14:39:46 +08:00 |
|
caoyanyi
|
e289047035
|
* Adjust the order in which document library fields are created.
|
2023-04-20 14:32:11 +08:00 |
|
宋辰轩
|
698470e6f6
|
* Modify chart group and dimension lang.
|
2023-04-20 14:18:04 +08:00 |
|
朱金勇
|
23afc42e5b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-20 06:07:43 +00:00 |
|
朱金勇
|
9bffb11ef0
|
* Fix bug#34403.
|
2023-04-20 06:07:30 +00:00 |
|
王怡栋
|
fd62ec24c3
|
Merge branch 'dev/gfl_fixbug' into 'master'
Dev/gfl fixbug
See merge request easycorp/zentaopms!7500
|
2023-04-20 05:26:16 +00:00 |
|
guofeilong
|
66f95eefca
|
* Code for fix bug in change version update .
|
2023-04-20 13:24:57 +08:00 |
|
guofeilong
|
5ecfcd3772
|
* Code for task #91380 .
|
2023-04-20 13:24:26 +08:00 |
|
guofeilong
|
222a718c0e
|
* Adjust code for bug #34267 .
|
2023-04-20 13:24:26 +08:00 |
|
刘刚
|
8e7db6d8ec
|
Merge branch 'daitingting_upgrade' into 'master'
* Match the group of dimension 1.
See merge request easycorp/zentaopms!7499
|
2023-04-20 05:22:16 +00:00 |
|
tianshujie
|
cf7cf423a3
|
* Limit header length.
|
2023-04-20 13:19:54 +08:00 |
|
daitingting
|
c4484f1ff9
|
* Match the group of dimension 1.
|
2023-04-20 13:19:40 +08:00 |
|
liugang
|
5510129959
|
* Fix sql error.
|
2023-04-20 05:17:48 +00:00 |
|
liugang
|
ea5783a908
|
* Fix sql error.
|
2023-04-20 05:16:24 +00:00 |
|
朱金勇
|
b239aba280
|
* Fix bug#34420.
|
2023-04-20 05:11:26 +00:00 |
|
liugang
|
c5d5b9495c
|
* Fix sql error - change comma to semicolon.
|
2023-04-20 05:09:08 +00:00 |
|
刘刚
|
f4c9bc22b3
|
Merge branch 'cyy_api' into 'master'
* Modify locate.
See merge request easycorp/zentaopms!7494
|
2023-04-20 04:41:49 +00:00 |
|
朱金勇
|
4b4da1021f
|
* Fix bug#34453.
|
2023-04-20 04:30:44 +00:00 |
|
朱金勇
|
d125177bcf
|
* Fix bug#34425.
|
2023-04-20 04:14:08 +00:00 |
|
朱金勇
|
7de8f305c0
|
* Fix bug#34389.
|
2023-04-20 04:10:07 +00:00 |
|
朱金勇
|
366699d74d
|
* Fix bug#34424.
|
2023-04-20 03:59:12 +00:00 |
|
朱金勇
|
bd3e9172c2
|
* Fix bug#34427.
|
2023-04-20 03:56:25 +00:00 |
|
朱金勇
|
532ff84269
|
* Fix bug#34446.
|
2023-04-20 03:50:25 +00:00 |
|
朱金勇
|
f91b05b309
|
* Fix bug#34444.
|
2023-04-20 03:44:43 +00:00 |
|
tianshujie
|
2059a74de0
|
* Fix bug #34461.
|
2023-04-20 11:32:34 +08:00 |
|
朱金勇
|
119e6fe3f1
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-20 03:26:46 +00:00 |
|
朱金勇
|
a475e8575c
|
* Fix bug#34396.
|
2023-04-20 03:26:36 +00:00 |
|
tianshujie
|
1a90f75ffe
|
Merge branch 'cyy_api' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_api
|
2023-04-20 11:26:08 +08:00 |
|
tianshujie
|
9cfaf694ec
|
* Replace favorites button.
|
2023-04-20 11:25:46 +08:00 |
|
wangyidong
|
107265a099
|
* fix bug for init js var.
|
2023-04-20 11:25:23 +08:00 |
|
朱金勇
|
f3989ee08c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-20 03:18:20 +00:00 |
|
朱金勇
|
d2f7cdbad8
|
* Fix bug#34411.
|
2023-04-20 03:18:11 +00:00 |
|
刘刚
|
72671bbd67
|
Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Add bi builtin config.
See merge request easycorp/zentaopms!7498
|
2023-04-20 03:18:00 +00:00 |
|
liugang
|
8a17f4d65f
|
* Enclose MySQL keywords in backticks
|
2023-04-20 03:15:13 +00:00 |
|
wangyuting2
|
9e88925e14
|
* Add bi builtin config.
|
2023-04-20 11:14:54 +08:00 |
|
刘刚
|
668d9689b1
|
Merge branch 'zentaobiz39_bi_wangyuting' into 'master'
* Fix chart browse bug.
See merge request easycorp/zentaopms!7497
|
2023-04-20 03:14:39 +00:00 |
|
刘刚
|
7fcfc0a769
|
Merge branch 'fix_bug_qxz' into 'master'
* Fix bug#33355.
See merge request easycorp/zentaopms!7496
|
2023-04-20 03:14:32 +00:00 |
|
刘刚
|
75b14759b2
|
Merge branch 'sprint/scx_updategroup' into 'master'
* Add finish_project_effort_deviation to group.
See merge request easycorp/zentaopms!7495
|
2023-04-20 03:14:25 +00:00 |
|
wangyuting2
|
e3818f2999
|
* Fix chart browse bug.
|
2023-04-20 11:13:04 +08:00 |
|
宋辰轩
|
7d3c84fb73
|
* Add finish_project_effort_deviation to group.
|
2023-04-20 11:08:50 +08:00 |
|
朱金勇
|
cb2c15ac07
|
* Fix bug#34447.
|
2023-04-20 03:05:35 +00:00 |
|
qixinzhi
|
2dad2fab89
|
* Fix bug#33355.
|
2023-04-20 03:04:29 +00:00 |
|
caoyanyi
|
2f5b21ed76
|
* Modify page style.
|
2023-04-20 11:02:05 +08:00 |
|
tianshujie
|
557061330d
|
* Change the color of the document name in the document list.
|
2023-04-20 10:41:26 +08:00 |
|
朱金勇
|
ba630dcbff
|
* Fix typo.
|
2023-04-20 02:35:33 +00:00 |
|