Commit Graph
55066 Commits
Author SHA1 Message Date
hufangzhou efb4d64ca2 * Fix bug #34875. 2023-04-27 09:21:11 +08:00
caoyanyi ec065a3d52 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-27 09:16:56 +08:00
caoyanyi a83cb3fc39 * Modify download qrcode. 2023-04-27 09:16:36 +08:00
wangyidong 0f230d84a5 * fix bug #34876. 2023-04-27 09:15:51 +08:00
caoyanyi 818316d4aa Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-26 20:55:39 +08:00
caoyanyi f65572c2f7 * Modify update sql. 2023-04-26 20:55:20 +08:00
wangyidong 9c22942526 * fix bug #34834. 2023-04-26 20:50:56 +08:00
caoyanyi 365e76bbe3 * Adjust code. 2023-04-26 19:00:29 +08:00
tianshujie 52a1145abc Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-26 18:14:58 +08:00
tianshujie 96b7ae1f55 * Fix bug #34710. 2023-04-26 18:14:45 +08:00
qixinzhi 29031e1fd8 * Fix bug #34687. 2023-04-26 10:01:18 +00:00
tianshujie a606bb13e9 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-26 17:48:01 +08:00
tianshujie 9e477d0b58 * Fix bug #34792. 2023-04-26 17:47:47 +08:00
caoyanyi 5d4ce7e138 * Modify app download qrcode. 2023-04-26 17:43:01 +08:00
zhaoke fd45a86ed6 * Fix bug #34824. 2023-04-26 16:49:49 +08:00
zhaoke 41f8a150aa Merge branch '18.4' of git.zcorp.cc:easycorp/zentaopms into 18.4 2023-04-26 16:37:16 +08:00
zhaoke 0b2f431334 * Fix bug #34594. 2023-04-26 16:36:57 +08:00
hufangzhou 196d8ef79c * Modify the change log. 2023-04-26 16:33:46 +08:00
zhaoke 43e4423217 Merge branch '18.4' of git.zcorp.cc:easycorp/zentaopms into 18.4 2023-04-26 16:24:45 +08:00
zhaoke 87d5a04905 * Fix bug #34824. 2023-04-26 16:24:19 +08:00
王怡栋 0bc8641ab7 Merge pull request '* Fix bug #34847.' (#19) from fixbug_18.4_tanghucheng into 18.4
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/19
2023-04-26 16:10:10 +08:00
tanghucheng 7b7a0a81a1 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into fixbug_tanghucheng 2023-04-26 16:05:18 +08:00
tanghucheng d7b5a066b4 * Fix bug #34847. 2023-04-26 16:04:53 +08:00
hufangzhou d48556b15a * Fix bug #34864. 2023-04-26 15:40:16 +08:00
zhaoke 11309e978c Merge branch '18.4' of git.zcorp.cc:easycorp/zentaopms into 18.4 2023-04-26 15:32:32 +08:00
zhaoke a0c035343e * Fix bug #34826,34821,34815. 2023-04-26 15:30:50 +08:00
宋辰轩 51c10d9007 xMerge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 184 2023-04-26 15:28:28 +08:00
宋辰轩 bcc7ce83cd * Remove param. 2023-04-26 15:28:21 +08:00
caoyanyi bf37b28784 * Fix bug #34677. 2023-04-26 15:26:47 +08:00
hufangzhou bccd7f677e * Fix bug #34868. 2023-04-26 15:17:11 +08:00
wangyidong 06f7aa8a48 * fix bug #34562. 2023-04-26 15:00:33 +08:00
liumengyi 4918c8041c * Fix bug #34859. 2023-04-26 14:26:47 +08:00
liumengyi 69938de2e5 * Fix bug #34855. 2023-04-26 14:18:16 +08:00
liumengyi a2a50d5972 Merge branch '18.4' of git.zcorp.cc:easycorp/zentaopms into 18.4 2023-04-26 14:12:38 +08:00
hufangzhou 1e8d71c001 * Fix bug #34840. 2023-04-26 14:11:43 +08:00
liumengyi c7dbc271c6 * Fix bug #34849. 2023-04-26 14:11:41 +08:00
wangyidong dfcdb5d99c * fix bug #34848. 2023-04-26 12:12:48 +08:00
wangyidong 575990b6a3 * fix bug #34846. 2023-04-26 11:27:40 +08:00
hufangzhou cb4cf7a1b8 * Fix bug #34771. 2023-04-26 11:20:23 +08:00
hufangzhou b8044c52d6 * Fix bug #34843. 2023-04-26 10:57:44 +08:00
liugang c5c6327271 * Change the redirect url when toggle year or dept or account in annual data page - fix bug #34836. 2023-04-26 02:53:55 +00:00
hufangzhou e4bdf5da89 * Fix bug #34827. 2023-04-26 10:45:12 +08:00
tianshujie 09fa216c5d * Fix bug #34837. 2023-04-26 10:31:32 +08:00
宋辰轩 7d90548456 * Fix bug for upgrade. 2023-04-26 10:24:13 +08:00
宋辰轩 9f89bc0c8f Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 184 2023-04-26 09:54:55 +08:00
宋辰轩 3ae41cd8ff * Modify updatepivotgroup. 2023-04-26 09:54:48 +08:00
wangyidong bcada1034e * fix bug #34746. 2023-04-26 09:54:40 +08:00
hufangzhou b3cbdf76dc * Change version. 2023-04-26 09:22:10 +08:00
hufangzhou e79789d9bc * Modify the xuan commit for DM. 2023-04-26 08:50:39 +08:00
liugang 4981fcb9dd * Fix error cann't use the fetch function to call an encrypted extended control method - fix bug #34614, 34615, 34627. 2023-04-26 00:39:07 +00:00