Commit Graph
54093 Commits
Author SHA1 Message Date
tianshujie 84712f0f51 * Fix bug #34297. 2023-04-17 17:26:07 +08:00
wangyidong 5399ec46be * code for task #91381. 2023-04-17 17:14:56 +08:00
朱金勇 4f90963c0f * Fix typo. 2023-04-17 09:04:04 +00:00
朱金勇 3e887438ef * Fix bug#34221. 2023-04-17 09:00:33 +00:00
王怡栋 cf9d4348ab Merge branch 'tsj_sort' into 'master'
Tsj sort

See merge request easycorp/zentaopms!7440
2023-04-17 08:42:15 +00:00
tianshujie 7a8d7ace0b * Code for task #91391. 2023-04-17 16:41:36 +08:00
朱金勇 3385f5d6e4 * Fix multiple task. 2023-04-17 08:18:39 +00:00
王怡栋 7eb325f6a9 Merge branch 'dev/gfl_zentaopms_307' into 'master'
Dev/gfl zentaopms 307

See merge request easycorp/zentaopms!7439
2023-04-17 08:02:41 +00:00
guofeilong cde83aa2b0 * Code for task #91379 . 2023-04-17 16:01:32 +08:00
guofeilong af5e9ab505 * Code for task #91379 . 2023-04-17 15:58:39 +08:00
liugang 141b77e057 * Process exist privileges when upgrade. 2023-04-17 07:54:52 +00:00
朱金勇 ba3feadb9d * Fix bug#34244. 2023-04-17 07:52:08 +00:00
朱金勇 93acd3cc77 * Fix bug#34233. 2023-04-17 07:43:55 +00:00
王怡栋 da0259927a Merge branch 'goview' into 'master'
* Updata go-view dist.

See merge request easycorp/zentaopms!7438
2023-04-17 07:34:54 +00:00
王怡栋 dd33c54395 Merge branch 'sprint/scx_addUpdate2BI_func' into 'master'
Add func for update18_3.

See merge request easycorp/zentaopms!7436
2023-04-17 07:34:35 +00:00
王怡栋 c976249f68 Merge branch 'jenkins_test' into 'master'
Jenkins ui

See merge request easycorp/zentaopms!7435
2023-04-17 07:34:01 +00:00
曾刚 22d0847609 Jenkins ui 2023-04-17 07:34:01 +00:00
王怡栋 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
qixinzhi 51f44a622c * Updata go-view dist. 2023-04-17 07:28:27 +00:00
宋辰轩 7374a11495 Add func for update18_3. 2023-04-17 15:23:30 +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
tianshujie c689f25199 * Code for task #91391. 2023-04-17 14:07:09 +08: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
tianshujie 8fc7ca7525 * Code for task #91391. 2023-04-17 13:56:21 +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