Commit Graph
55634 Commits
Author SHA1 Message Date
wangyidong cd00738d77 * adjust for product create. 2023-04-27 15:59:31 +08:00
陈涛 9b98a7c940 + product: add test function for getPagerProductsWithProgramIn. 2023-04-27 15:59:21 +08:00
陈涛 25a5795ca8 * Split all function of product module. 2023-04-27 15:56:59 +08:00
dingguodong eba1634960 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-27 15:52:34 +08:00
dingguodong 5cd2a98e72 + Add some UTC for todoModel::create. 2023-04-27 15:51:08 +08:00
liuhong d1a700fd00 * Adust code for dosuspend unit test. 2023-04-27 15:48:02 +08:00
liuhong b7ae9f389e Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-27 15:42:56 +08:00
liuhong fb81f84310 * Adjust suspend function code with model and tao unit test 2023-04-27 15:41:44 +08:00
dingguodong 026bddd142 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-27 15:37:25 +08:00
dingguodong 28a23d805b + Reset dao::errors before CRUD to prevent from last CRUD disturb new CRUD. 2023-04-27 15:36:59 +08:00
qixinzhi 6d2d2456a4 Merge branch 'master_xieqiyu_getlist' 2023-04-27 07:17:51 +00:00
qixinzhi 4baebf4391 Merge branch 'master_xieqiyu_getlist' of https://git.zcorp.cc/easycorp/zentaopms into master_xieqiyu_getlist 2023-04-27 07:16:56 +00:00
xieqiyu 58898acc4c * Modify code review. 2023-04-27 07:14:27 +00:00
guofeilong 412ea9d60d * Code for function activate test. 2023-04-27 15:13:21 +08:00
tianshujie 50eee50acf * Code for task #92057. 2023-04-27 15:04:48 +08:00
xieqiyu a793adf827 * Reconstruct getbugs. 2023-04-27 06:47:50 +00:00
dingguodong 984d167ee6 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-27 14:45:26 +08:00
dingguodong 9d06ab6010 * Clean table by default. 2023-04-27 14:45:05 +08:00
sunhao ddaddfde26 * refactor file header 2023-04-27 14:35:44 +08:00
dingguodong 3c64e7a6ff - Remove set sql mode. 2023-04-27 14:31:43 +08:00
sunhao 6f7a11d740 * zin: clear global render list after used them 2023-04-27 14:29:52 +08:00
xushenjie 3a31037d8d * Change the idvalue field in the zt_todo table to objectID. 2023-04-27 05:54:21 +00:00
xushenjie 136c71c057 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 05:39:29 +00:00
xushenjie 411e02c5fe * Adjust the create form receive field from idvalue to objectID. 2023-04-27 05:39:26 +00:00
dingguodong 5114ab803c Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-27 13:35:52 +08:00
dingguodong 00ad9f7372 * Truncate table to reset auto increment number. 2023-04-27 13:35:31 +08:00
guofeilong 6df3a2952f * Code for func project start . 2023-04-27 13:34:28 +08:00
guofeilong 91fedfe5bb Revert "* Revert commit."
This reverts commit afa257ee10.
2023-04-27 13:34:00 +08:00
綦新志 70f7eea93e Merge pull request '* Modify bug create.' (#20) from sprint/scx_bug_create into master
Reviewed-on: https://git.zcorp.cc/easycorp/zentaopms/pulls/20
2023-04-27 13:33:08 +08:00
宋辰轩 a9c29b0ce2 * Modify getbyid comment. 2023-04-27 13:31:36 +08:00
宋辰轩 a1f556df73 * Fix bool and false. 2023-04-27 13:27:20 +08:00
guofeilong 422c5f1683 * Code for function activate . 2023-04-27 13:23:49 +08:00
宋辰轩 f2cb5fa8e3 * Modify code. 2023-04-27 13:17:37 +08:00
宋辰轩 bc9bc67cac * Modify bug create. 2023-04-27 13:09:19 +08:00
chaideqing afa257ee10 * Revert commit. 2023-04-27 10:22:53 +08:00
chaideqing 68246a7e84 * Fix can browse image when not login. 2023-04-27 09:52:15 +08:00
xushenjie 5ed2053378 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 01:39:59 +00:00
xushenjie 2e5e50f99e * Change the idvalue field of the zt_todo table to objectID. 2023-04-27 01:39:31 +00:00
sunhao 3f7c9455f1 * zin: show page size and load speed in zinbar 2023-04-27 09:38:17 +08:00
zhouxin bd36411959 * Fix bug of tao in task module. 2023-04-27 01:28:35 +00:00
zhaoke eaf718d7a6 Merge branch 'master' of git.zcorp.cc:easycorp/zentaopms 2023-04-27 09:25:50 +08:00
zhaoke 0319818213 * Fix ztf run fail when expect contains two zero. 2023-04-27 09:24:11 +08:00
zenggang 19bcdfeef5 * getdataoftasksperexecution method 2023-04-27 01:19:05 +00:00
tianshujie 5b418eb8db * Modify comment of tao.php. 2023-04-27 09:16:12 +08:00
sunguangming abf11bed48 * Adjust for code-review. 2023-04-27 09:13:12 +08:00
sunguangming 2b22c6a337 Merge branch 'master' of https://git.zcorp.cc/easycorp/zentaopms 2023-04-27 09:10:21 +08:00
sunguangming 861e195891 * Adjust code-review opinions. 2023-04-27 09:07:40 +08:00
Lufei 62b1e1ad5b * Fix removePHPTAG error. 2023-04-27 08:46:07 +08:00
sunhao 48a4a2f875 * zin: optimize zinbar UI 2023-04-27 08:35:10 +08:00
xieqiyu 9667f0603b * Reconstruct getbugs. 2023-04-26 14:27:13 +00:00