Commit Graph
17377 Commits
Author SHA1 Message Date
qiyu-xie cf3ba0798f * Finish task#8698. 2020-12-16 14:24:30 +08:00
hufangzhou db3dccfe5e Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 14:22:45 +08:00
hufangzhou 30e13a49c8 * Finish task#8687. 2020-12-16 14:22:32 +08:00
tianshujie98 62bbdfa544 * Finish task #8695. 2020-12-16 14:21:58 +08:00
leiyong 290e4fe73d * Finish task#8699. 2020-12-16 14:10:34 +08:00
hufangzhou bc839b6e9b Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 13:49:24 +08:00
hufangzhou 8b80e3b217 * Finish task#8656. 2020-12-16 13:49:11 +08:00
holan20180123 bc5decef6e Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 13:44:20 +08:00
holan20180123 61d69d5321 * Finish task #8679. 2020-12-16 13:44:00 +08:00
hufangzhou adac247b71 * Finish task#8657. 2020-12-16 10:16:12 +08:00
hufangzhou 18d59ed478 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 10:07:12 +08:00
hufangzhou f73812b3e1 * Modify the function comment. 2020-12-16 10:07:02 +08:00
leiyong b7f2235dc4 Merge branch 'master' of github.com:easysoft/zentaopms 2020-12-16 09:04:35 +08:00
leiyong cd5e4e1593 * Adjust code. 2020-12-16 09:04:13 +08:00
hufangzhou 0d1b376fcf * Adjust the code. 2020-12-16 08:59:44 +08:00
hufangzhou 6583d98e15 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-16 08:26:01 +08:00
hufangzhou dbcc5c949b * Adjust the code. 2020-12-16 08:25:44 +08:00
tianshujie98 90f9d9ad7c * Adjust code style. 2020-12-15 17:29:59 +08:00
leiyong a173276115 * Fix bug. 2020-12-15 10:16:39 +08:00
qiyu-xie 8a1e26837d * Delete link. 2020-12-15 09:34:58 +08:00
hufangzhou 1bcadb5260 * Fix an error. 2020-12-15 08:25:03 +08:00
leiyong 200410c2bb * Delete PGMView method. 2020-12-14 23:31:13 +08:00
qiyu-xie c71a5b14bb * Fix bug. 2020-12-14 17:20:24 +08:00
qiyu-xie db55458c15 * Modify the overview of the project, only one product is counted. 2020-12-14 16:35:48 +08:00
holan20180123 ff67859fd0 * Fix bug #3708. 2020-12-14 16:24:35 +08:00
tianshujie98 49cb5fef8b * Add comment. 2020-12-14 16:20:49 +08:00
tianshujie98 0d187a518b * Adjust code style. 2020-12-14 16:20:49 +08:00
holan20180123 f4dc0e656c * Fix bug #3708. 2020-12-14 16:10:47 +08:00
qiyu-xie 8910eaba5d * Fix bug#3729. 2020-12-14 15:17:00 +08:00
qiyu-xie f25e318ed0 * Modify link. 2020-12-14 15:17:00 +08:00
leiyong 7a4947d970 * Adjust code. 2020-12-14 14:47:51 +08:00
hufangzhou 129b727375 * Fix a bug. 2020-12-14 14:10:56 +08:00
tianshujie98 f60745172c * Delete duplicate fields. 2020-12-14 13:52:37 +08:00
holan20180123 0847f26429 * Fix bug #3759. 2020-12-14 13:39:51 +08:00
qiyu-xie 64fc9f5c84 * Fix bug#3757. 2020-12-14 13:19:45 +08:00
qiyu-xie d6e26536a6 * Modify code for task#8591. 2020-12-14 10:50:44 +08:00
tianshujie98 a91ebce2fb * Fix bug. 2020-12-14 10:38:06 +08:00
tianshujie98 6db741c5da * Fix bug #3758. 2020-12-14 10:30:27 +08:00
hufangzhou e168ba7313 Merge branch 'master' of https://github.com/easysoft/zentaopms 2020-12-14 08:47:06 +08:00
hufangzhou 119b89ef16 * Adjust the code. 2020-12-14 08:46:40 +08:00
wangyidong c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
qiyu-xie a18ac6792e * Modify call a database query in foreach. 2020-12-11 17:34:31 +08:00
tianshujie98 f34457b20e * Add comment. 2020-12-11 17:26:46 +08:00
wangyidong 5dbd8270bb * fix bug #3744. 2020-12-11 17:22:40 +08:00
wangyidong eadd494a9b * fix bug. 2020-12-11 16:56:13 +08:00
wangyidong aa7c7c43c4 * fix bug. 2020-12-11 16:56:13 +08:00
tianshujie98 f734f15e7a * Adjust code style. 2020-12-11 16:52:33 +08:00
tianshujie98 f0d0a807ee * Upgrade unified zt_build table format. 2020-12-11 16:40:42 +08:00
leiyong 3ae0d54676 * Fix bug. 2020-12-11 16:26:47 +08:00
qiyu-xie feb8e765ae * Optimize the code. 2020-12-11 16:17:18 +08:00