Commit Graph
91 Commits
Author SHA1 Message Date
lanzongjun 5c95d9fd18 * fix bug #25016 2022-07-08 14:52:46 +08:00
lanzongjun 31109d6519 * fix task #60100 2022-07-07 16:36:24 +08:00
lanzongjun f51027b090 * fix bug #24280 2022-07-07 16:06:48 +08:00
lanzongjun 6555c7a30a * fix bug #24937 2022-07-07 15:40:38 +08:00
lanzongjun ec9c9f2a0e * fix bug #24937 2022-07-07 13:32:34 +08:00
lanzongjun d664bc44b0 * fix bug #24785 2022-07-06 15:39:33 +08:00
lanzongjun d6a387935f * fix bug #24813 2022-07-06 14:44:36 +08:00
lanzongjun 5f468b66a7 test 2022-07-06 11:28:47 +08:00
lanzongjun a7410f7986 * fix bug #24806-2 2022-07-06 11:23:31 +08:00
lanzongjun 42e8032269 * fix bug #24806-2 2022-07-06 11:20:32 +08:00
lanzongjun f63542faf3 * fix bug #24806 2022-07-06 11:18:06 +08:00
lanzongjun 305ea3d502 * fix bug #24806 2022-07-06 11:17:12 +08:00
lanzongjun 4fd0e3bcfe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-07-06 11:16:01 +08:00
lanzongjun fbc4db545c * fix bug #24806 2022-07-06 11:07:39 +08:00
lanzongjun dd30f6354b * fix bug #24071 2022-07-01 11:28:58 +08:00
lanzongjun 8bc8979c20 * fix bug #24071 2022-07-01 10:59:06 +08:00
lanzongjun 7caab2be4d * fix bug #23996 2022-06-30 16:11:31 +08:00
lanzongjun 76b79da0c1 * fix bug #23996 2022-06-30 15:20:38 +08:00
lanzongjun adbefcd261 Merge branch 'sprint/zentaomax35' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-30 15:08:09 +08:00
lanzongjun f73072e6de * fix bug #23729 2022-06-30 15:07:31 +08:00
lanzongjun b953f00253 * fix bug #23954 2022-06-30 11:28:00 +08:00
lanzongjun a8358b6ba5 * fix bug #23954 2022-06-30 11:27:04 +08:00
lanzongjun 2885fa3fe7 Merge branch 'sprint/zentaomax35' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-30 10:27:34 +08:00
lanzongjun 66ea6430cf * fix bug #24382 2022-06-30 08:52:59 +08:00
lanzongjun 694410817a * fix bug #24382 2022-06-30 08:50:31 +08:00
lanzongjun d5afe20770 * fix bug #23766 2022-06-20 15:46:10 +08:00
lanzongjun 6786b4d08c * fix bug #23932 2022-06-20 11:17:34 +08:00
lanzongjun 2c49643589 * fix bug #23766 2022-06-20 09:40:46 +08:00
lanzongjun 898bb949c1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-20 09:30:53 +08:00
lanzongjun 3b7adad82e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-17 15:29:36 +08:00
lanzongjun cdaf6b5ce0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-17 09:06:39 +08:00
lanzongjun 0786156bc0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-16 08:45:29 +08:00
lanzongjun a5f7253785 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-14 13:58:52 +08:00
lanzongjun a4756d1cd5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-14 08:17:56 +08:00
lanzongjun 8d77a381a3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-06-13 08:35:08 +08:00
lanzongjun 7c6b288878 * recover user 2022-06-10 17:26:57 +08:00
lanzongjun b31b45c11f * finish task #56023 2022-06-08 15:44:50 +08:00
lanzongjun c25d199878 * finish bug #23282 2022-06-06 14:20:34 +08:00
lanzongjun 89bf907dff * finish bug #23282 2022-06-06 14:16:38 +08:00
lanzongjun 61234b500f * fix bug workflowdatasource 2022-05-31 16:07:58 +08:00
lanzongjun c86bf9d730 * fix bug #23002 2022-05-26 17:23:32 +08:00
lanzongjun 36010b797f * fix bug #54940 2022-05-25 15:58:26 +08:00
lanzongjun 0a84e5fb81 * fix bug #54940 2022-05-25 15:51:48 +08:00
lanzongjun 5eb84a81d0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/189_package_lanzongjun 2022-05-25 09:45:32 +08:00
lanzongjun ae45c26343 * fix bug #54947 2022-05-25 09:45:13 +08:00
lanzongjun 867152e2bc * fix bug #22570 2022-05-18 13:33:54 +08:00
lanzongjun ece8976470 * fix bug #22570 2022-05-18 13:20:43 +08:00
lanzongjun 6e0e9d2348 * fix bug #22570 2022-05-18 08:43:08 +08:00
lanzongjun 54db8e3f91 Merge branch 'sprint/189_package' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/189_package 2022-05-17 17:13:30 +08:00
lanzongjun 10eebbd136 * fix bug #22570 2022-05-17 17:13:17 +08:00
lanzongjun 50487724dc * modify code for sql 2022-05-13 17:53:29 +08:00
lanzongjun 20042e3de0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-05-13 17:40:10 +08:00
lanzongjun 9b1ef72837 * fix bug #22413 2022-05-13 16:23:55 +08:00
lanzongjun 2d4b0ad2b3 * fix bug #22413 2022-05-13 16:23:43 +08:00
lanzongjun 9f1a8e958e * fix bug #22413 2022-05-13 14:59:04 +08:00
lanzongjun 2309a35d86 * fix bug #22417 2022-05-13 14:48:34 +08:00
lanzongjun 3cf3682e41 * modify error sql 2022-05-13 09:27:12 +08:00
lanzongjun 7f93dcd1c4 * add method sql 2022-05-13 09:23:00 +08:00
lanzongjun 4a5c3a2f0e * add method sql 2022-05-13 08:48:19 +08:00
lanzongjun 24a67405db * add sql 2022-05-12 17:07:58 +08:00
lanzongjun 63bd7e6902 * add sql 2022-05-12 17:04:55 +08:00
lanzongjun 8d978d4295 * add sql 2022-05-12 13:18:22 +08:00
lanzongjun 39a4375b12 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-05-12 13:16:08 +08:00
lanzongjun 921ef0b7cf * add sql 2022-05-12 10:00:02 +08:00
lanzongjun e026472d00 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-05-12 09:10:37 +08:00
lanzongjun 7faef1af2e * fix task #53588 2022-05-11 11:27:28 +08:00
lanzongjun 2f060c927b * fix task #53588 2022-05-11 11:00:19 +08:00
lanzongjun fc36941647 * fix task #53588 2022-05-11 10:58:57 +08:00
lanzongjun f4c8db7ed8 * fix task #53591 2022-05-10 17:02:03 +08:00
lanzongjun 1b5b443174 * fix task #53591 2022-05-10 15:28:18 +08:00
lanzongjun 87164335b8 * delete unit test job 2022-05-09 16:12:46 +08:00
lanzongjun 0405e1de21 * unit test job 2022-05-09 13:39:08 +08:00
lanzongjun 920236775e * unit test job 2022-05-09 11:34:02 +08:00
lanzongjun 7c00db4f84 * unit test job 2022-05-09 11:32:38 +08:00
lanzongjun f7891a08a3 * unit test entry 2022-05-07 15:23:33 +08:00
lanzongjun 6e71332b6a * unit test entry 2022-05-07 11:26:53 +08:00
lanzongjun 5670696961 * unit test entry 2022-05-07 11:22:26 +08:00
lanzongjun 3bdab60664 * fix bug #22019 2022-04-28 15:48:24 +08:00
lanzongjun edb3c69e87 * fix bug #22008 2022-04-27 15:27:05 +08:00
lanzongjun cef78f131e * fix code format 2022-04-27 14:32:35 +08:00
lanzongjun 9b3b3b1e1a * fix bug #21988 2022-04-27 13:50:25 +08:00
lanzongjun e348c77a7a * fix bug #15814 2022-04-26 16:43:38 +08:00
lanzongjun 68270a031b * fix bug #15834 2022-04-26 10:50:44 +08:00
lanzongjun 956f302c57 * fix bug #14842 2022-04-25 17:27:56 +08:00
lanzongjun beb2ec67de * fix bug #17626 2022-04-25 17:11:13 +08:00
lanzongjun 5927f8e586 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-25 16:45:39 +08:00
lanzongjun c480a5203c * fix bug #16663 2022-04-25 13:52:37 +08:00
Zongjun Lan eb0be01303 * fix bug #18249 2022-04-24 16:09:00 +08:00
Zongjun Lan 15d35f955d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-24 15:25:35 +08:00
Zongjun Lan 05c0486560 Merge branch 'sprint/master_lanzongjun_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-24 14:13:19 +08:00
lanzongjun e011e6c2f0 * fix bug #18210 2022-04-24 14:11:33 +08:00