Commit Graph
54996 Commits
Author SHA1 Message Date
tianshujie 95419d98d9 * Fix bug #34718. 2023-04-25 11:21:47 +08:00
caoyanyi 6e9599ee20 * Modify table name quote, Fix bug #34661. 2023-04-25 11:12:07 +08:00
daitingting 6e3bef7090 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-25 11:00:15 +08:00
daitingting 809c08be10 * Add defautl pivot tables. 2023-04-25 10:59:36 +08:00
caoyanyi 24f75dd73b * Modify files get. 2023-04-25 10:49:10 +08:00
caoyanyi ca68bcace7 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-25 10:31:17 +08:00
caoyanyi e95dc38c86 * Modify field type. 2023-04-25 10:31:01 +08:00
wangyidong e22590328e Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-25 10:26:03 +08:00
wangyidong d01395e6b0 * fix bug #34581. 2023-04-25 10:25:37 +08:00
caoyanyi af2e8e00e9 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-25 10:03:17 +08:00
caoyanyi ccafeb1ee2 * Modify date format, Fix bug #34658. 2023-04-25 10:02:54 +08:00
qixinzhi 0da8040c86 * Fix bug#34624. 2023-04-25 01:55:10 +00:00
caoyanyi d15a73acd0 * Modify field quote. 2023-04-25 09:46:12 +08:00
qixinzhi 9030eeb96d * Fix bug#34664. 2023-04-25 01:20:38 +00:00
wangyidong 54d513129a * fix bug #34599. 2023-04-25 09:11:47 +08:00
wangyidong 9f2fcd4dcd Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-25 08:58:46 +08:00
wangyidong a6a329df2c * code for bug #34761. 2023-04-25 08:58:05 +08:00
daitingting 4002be4633 * Fix bug. 2023-04-25 08:54:08 +08:00
caoyanyi a6a1bb8b3d Merge branch 'cyy_fixbug' into 18.4 2023-04-25 08:45:37 +08:00
wangyidong b2b588adb4 * fix bug #34689. 2023-04-25 08:41:02 +08:00
wangyidong 61bf3f9d4a * fix bug #34761. 2023-04-25 08:36:29 +08:00
caoyanyi 44a0d56a01 * Fix bug #34753. 2023-04-24 23:30:35 +08:00
caoyanyi c4b3b74a78 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-24 23:19:42 +08:00
caoyanyi 4d12147600 * Modify database field. 2023-04-24 23:17:42 +08:00
wangyidong e7aa31d68e Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 21:01:04 +08:00
宋辰轩 18f0a9e65c * Modify dataview -> chart. 2023-04-24 20:41:18 +08:00
宋辰轩 564535f055 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 184 2023-04-24 20:32:19 +08:00
tianshujie 5de561dc41 * Fix bug #34760. 2023-04-24 20:31:52 +08:00
tianshujie 99956b799d Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 20:05:19 +08:00
tianshujie da3ce6e392 * Fix bug #34762. 2023-04-24 20:05:06 +08:00
wangyidong 076dcc7364 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 20:01:03 +08:00
liugang d8a1234ecd * Fix error the type of chart was overwritten. 2023-04-24 11:51:51 +00:00
liugang 3a7ba8e58f * Change lang items to upper case. 2023-04-24 11:51:21 +00:00
tianshujie df9d4cc61e Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 19:44:54 +08:00
tianshujie 0ac0f009ec * Fix bug #34642. 2023-04-24 19:44:41 +08:00
綦新志 53fd3d604a Merge pull request '* Fix bug#34665.' (#13) from fix_bug_qxz into 18.4
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/13
2023-04-24 19:35:41 +08:00
tianshujie 9ed9817f98 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 19:32:00 +08:00
tianshujie bb97a080a4 * Fix bug #34731. 2023-04-24 19:31:43 +08:00
wangyidong 2cd5d74fec * fix bug #34689. 2023-04-24 19:30:09 +08:00
qixinzhi a9f7c36692 * Fix bug#34665. 2023-04-24 11:26:05 +00:00
wangyidong dd0a0009ae Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 19:23:58 +08:00
wangyidong 6a77ce5c6d * fix bug #34713. 2023-04-24 19:23:26 +08:00
tianshujie 78ef7e88c4 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 19:19:36 +08:00
tianshujie ec88bdf34a * Error modifying jump link. 2023-04-24 19:19:17 +08:00
wangyidong 75e4b26c52 * fix bug #34717. 2023-04-24 19:07:05 +08:00
hufangzhou c553bc549a * Code for bug #34647. 2023-04-24 19:00:08 +08:00
wangyidong 88fa8fc839 * fix bug #34750. 2023-04-24 18:56:38 +08:00
hufangzhou 0b2ecad0f3 * Rename the privilege of todo-import2Today. 2023-04-24 18:49:09 +08:00
tianshujie 0c22ac5614 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 18:37:45 +08:00
tianshujie bf7cdc1ee1 * Fix bug #34725. 2023-04-24 18:37:32 +08:00