Commit Graph
54071 Commits
Author SHA1 Message Date
王怡栋 0dc041fbcf Merge branch 'dyl_fixbug' into 'master'
* fix upload files totalSize.

See merge request easycorp/zentaopms!7437
2023-04-17 07:32:37 +00:00
dingyongliang 273c6a0192 * fix upload files totalSize. 2023-04-17 15:30:37 +08:00
朱金勇 9fe8e0393c * Fix keywords. 2023-04-17 07:16:46 +00:00
朱金勇 619077d036 * Fix replace method. 2023-04-17 07:04:03 +00:00
liugang 07fa17e142 * Remove unused files when upgrade. 2023-04-17 06:42:56 +00:00
王怡栋 ae2d8120ae Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug

See merge request easycorp/zentaopms!7433
2023-04-17 06:23:03 +00:00
王怡栋 e5583f34ee Merge branch 'tsj_view' into 'master'
* Code for task #91378.

See merge request easycorp/zentaopms!7430
2023-04-17 06:22:31 +00:00
caoyanyi 9d9378e1dc * Modify db field. 2023-04-17 14:20:20 +08:00
liugang 5163c5e658 * Remove unused files. 2023-04-17 06:18:08 +00:00
朱金勇 c76fa5317e * Fix bug#34204. 2023-04-17 06:12:22 +00:00
caoyanyi b57c935be4 * Revert code. 2023-04-17 14:00:40 +08:00
朱金勇 681ef77189 * Fix bug#34207. 2023-04-17 05:59:03 +00:00
caoyanyi c843469210 * Modify sql error. 2023-04-17 13:57:55 +08:00
caoyanyi dabe30f67d * Code for bug 34254, Modify file remove error. 2023-04-17 13:56:33 +08:00
朱金勇 68559a8cb8 * Fix bug#34248. 2023-04-17 05:49:33 +00:00
朱金勇 049cf321f6 * Fix bug#34211. 2023-04-17 05:44:18 +00:00
liugang 6921b87571 * Use viewReport instead of instanceTemplate. 2023-04-17 05:37:48 +00:00
朱金勇 cd7ec9ee47 * Fix bug#34249. 2023-04-17 05:35:10 +00:00
刘刚 234697bdf7 Merge branch 'fix_bug_qxz' into 'master'
* Fix where condition sql with key words.

See merge request easycorp/zentaopms!7432
2023-04-17 05:22:38 +00:00
qixinzhi 0201ca4050 * Fix where condition sql with key words. 2023-04-17 05:18:46 +00:00
caoyanyi 86db9e7da4 * Code for bug 34252, Modidy database tyle language. 2023-04-17 13:13:22 +08:00
朱金勇 c67165ccd7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-17 05:10:15 +00:00
朱金勇 4ff5f28cfa * Fix bug#34226. 2023-04-17 05:05:05 +00:00
孙广明 5db818194e Merge branch 'sprint/scx_addlink' into 'master'
* Add biz png and modify screen first guide.

See merge request easycorp/zentaopms!7431
2023-04-17 05:03:06 +00:00
朱金勇 a35c6f8dd8 * Fix bug#34268. 2023-04-17 04:52:55 +00:00
朱金勇 d03698d3a2 * Fix bug#34235. 2023-04-17 04:39:08 +00:00
liugang f8db8566c7 * Process exist privileges of bi. 2023-04-17 03:31:12 +00:00
宋辰轩 0e63bf94cb *Modify version check. 2023-04-17 11:28:01 +08:00
宋辰轩 1074ac1970 * Add biz png and modify screen first guide. 2023-04-17 11:25:47 +08:00
liugang 9c4032caee + Revert a file used in measurement report. 2023-04-17 03:22:03 +00:00
liugang 5b37a6e73d - Remove unused code. 2023-04-17 03:20:58 +00:00
朱金勇 7ad02685c2 * Fix bug#34105. 2023-04-17 03:12:13 +00:00
tianshujie f4cda4d780 * Code for task #91378. 2023-04-17 10:57:00 +08:00
朱金勇 af61f4248d * Fix bug#34239. 2023-04-17 02:56:25 +00:00
朱金勇 b15c877da7 * Fix bug#34223. 2023-04-17 02:51:17 +00:00
朱金勇 1c130c628f * Fix bug#34201. 2023-04-17 02:07:22 +00:00
孙广明 2fac74f136 Merge branch 'sprint/scx_biguide' into 'master'
* Add png to zentao.

See merge request easycorp/zentaopms!7429
2023-04-17 00:58:48 +00:00
宋辰轩 c50fab01ad * Add png to zentao. 2023-04-17 08:53:30 +08:00
朱金勇 bf65000aff * Fix bug#34232. 2023-04-16 14:09:36 +00:00
朱金勇 7969effc29 * Fix bug#34139, 34238, 34075. 2023-04-16 13:54:16 +00:00
朱金勇 e074e17dc8 * Fix bugs of dmdb. 2023-04-16 11:53:19 +00:00
王怡栋 d776871aca Merge branch 'tsj_block' into 'master'
Tsj block

See merge request easycorp/zentaopms!7428
2023-04-14 09:31:50 +00:00
tianshujie 8fbab2b84f * Modify upgrade program. 2023-04-14 17:31:02 +08:00
王怡栋 9a79eb42e4 Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Adjust code for css in tree-item .

See merge request easycorp/zentaopms!7426
2023-04-14 09:21:53 +00:00
王怡栋 317a7ee205 Merge branch 'sprint/scx_task91131' into 'master'
* Finish task #91131.

See merge request easycorp/zentaopms!7427
2023-04-14 09:21:39 +00:00
tianshujie 23171d926d * Fix field problems. 2023-04-14 17:09:27 +08:00
宋辰轩 5424de798c * Finish task #91131. 2023-04-14 16:55:50 +08:00
guofeilong 3f3799eae8 * Adjust code for css in tree-item . 2023-04-14 16:50:34 +08:00
王怡栋 537833366d Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Adjust code for css in right menu .

See merge request easycorp/zentaopms!7425
2023-04-14 08:48:15 +00:00
guofeilong 2f169c2d7a * Adjust code for css in right menu . 2023-04-14 16:24:56 +08:00