Commit Graph
56484 Commits
Author SHA1 Message Date
liuhong d15f2d2cb6 Adjust code 2023-05-06 14:39:25 +08:00
liuhong 7e49b977dd Adjust code for control function ajaxGetExecution 2023-05-06 14:33:56 +08:00
dingguodong 97284611fd Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 14:26:08 +08:00
dingguodong 6a8bbe61f0 * Remove useless code and restructure code. 2023-05-06 14:25:18 +08:00
liuhong 18d9744ce0 * Adjust code for updateOrder control function. 2023-05-06 14:22:41 +08:00
liuhong b36b8306ec * Adjust code for whitelist. 2023-05-06 14:20:21 +08:00
caoyanyi 69c6fe2916 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 14:11:42 +08:00
caoyanyi b304ed2627 * Modify insert data num. 2023-05-06 14:11:03 +08:00
liuhong 79852db6d6 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 14:03:49 +08:00
liuhong 30085cfbfe * submit whitelist function for control layer. 2023-05-06 14:03:19 +08:00
tianshujie 5d530db94a Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 14:02:44 +08:00
tianshujie 1afd59b507 * Fix code error. 2023-05-06 14:02:35 +08:00
liuchenglong 532d31598d Merge remote-tracking branch 'origin/master' 2023-05-06 05:55:56 +00:00
liuchenglong 9b9fc7a12e + Add todoTao test case. 2023-05-06 05:55:11 +00:00
tianshujie 636b664c5e * Fix code error. 2023-05-06 13:53:49 +08:00
tianshujie 42b6a47248 * Fix code error. 2023-05-06 13:52:22 +08:00
dingyongliang 954d20c29f * zin: fix className with point, p-1.\5 -> p-1.5. 2023-05-06 13:34:30 +08:00
caoyanyi a96556d36e Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 13:31:34 +08:00
caoyanyi 73c7860ae0 * Modify unit test data. 2023-05-06 13:31:17 +08:00
lanzongjun 8c72bec666 + Add todo tao tc. 2023-05-06 13:27:08 +08:00
lanzongjun bee7df5a53 + Add todo tao tc. 2023-05-06 13:12:28 +08:00
lanzongjun 2a799e92c2 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 13:11:27 +08:00
lanzongjun f27ac44c69 * Adjusted todo tao insert func. 2023-05-06 13:11:24 +08:00
hufangzhou 0cee1c0c58 * Code for refactor task-batchCreate. 2023-05-06 13:06:33 +08:00
tianshujie c9c340d0e8 * Split the function that create the task. 2023-05-06 11:33:40 +08:00
caoyanyi 645a190dbf * Split getOverviewList function. 2023-05-06 11:23:38 +08:00
caoyanyi 6eab6ac7ee * Modify unit test case. 2023-05-06 11:22:56 +08:00
xushenjie 72fe4034ff * Remove unwanted method parameter passes of todoController::create(). 2023-05-06 03:16:21 +00:00
liuhong 6249848b91 * Adjust code for dealMutipleProduct. 2023-05-06 11:00:12 +08:00
liuhong 5491c95582 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 10:52:21 +08:00
liuhong 5bf1cc5849 * Adjust code for manageProduct function. 2023-05-06 10:51:55 +08:00
lanzongjun 3f7834f8d6 + Add todo tao tc. 2023-05-06 10:30:13 +08:00
xushenjie 8404b44b28 * Adjust the unit test script for todoModel::batchCreate(). 2023-05-06 02:28:09 +00:00
xushenjie b0d1d2b970 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 02:19:24 +00:00
xushenjie 061854b0b8 * Optimize todoController::batchCreate () code logic. 2023-05-06 02:19:21 +00:00
liuhong c0f69e7e0c Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 10:18:39 +08:00
liuhong 8eb30ef1fd * Adjust code for prepareCreateExtras function. 2023-05-06 10:17:51 +08:00
dingyongliang f6e87493ca * refactor btngroup wg. 2023-05-06 10:15:58 +08:00
xushenjie ee4a78505d * Fix miswritten code of todo zen file. 2023-05-06 02:12:13 +00:00
shenshulong e34c9fd642 * Adjusted programplan config form and zen buildAjaxCustomView function. 2023-05-06 02:07:38 +00:00
liuchenglong 7ba0dac50d Merge remote-tracking branch 'origin/master' 2023-05-06 01:55:40 +00:00
liuchenglong 2fe32edde4 * Resolve confilict. 2023-05-06 01:55:07 +00:00
jukui faa7df2ad2 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 09:51:14 +08:00
jukui 106990544e * Modify getselfandchildrenlist function and test case for programplan model. 2023-05-06 09:51:01 +08:00
liuchenglong 1214dc05b7 * Resolve confilict. 2023-05-06 01:51:00 +00:00
shenshulong 64cc586bd4 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 01:47:52 +00:00
shenshulong a09b477950 * Adjusted programplan ajaxCustom function. 2023-05-06 01:47:30 +00:00
dingguodong e0a5cde05f Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-05-06 09:44:50 +08:00
dingguodong 1334804d34 * Replace $this->productID with $productID for better readable code. 2023-05-06 09:43:30 +08:00
xushenjie 3e8187d89f Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-05-06 01:42:53 +00:00