Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
40,844 Commits 2 Branches 292 Tags
0400a2628afcd2d7833babbcaabf80d74d76dce2
Commit Graph
762 Commits
Author SHA1 Message Date
孙广明 9ac3ed7851 * Code for product order. 2022-06-17 16:23:46 +08:00
tianshujie fa117ec408 * Delete useless code. 2022-06-16 17:23:34 +08:00
tianshujie fc2aea0aa9 * Delete useless code. 2022-06-16 17:21:50 +08:00
孙广明 1ca935f2b4 Merge branch 'sgm_fixbug' into 'master' 
* Change product browse order btn.

See merge request easycorp/zentaopms!3987
 2022-06-16 08:53:44 +00:00
孙广明 5af03f4cf6 * Change product browse order btn. 2022-06-16 16:52:08 +08:00
sunjun 7dfc3f64a2 fixbug_sunjun_23810 2022-06-16 05:49:32 +00:00
mayue d3018dd978 * Optimize code. 2022-06-10 17:25:14 +08:00
mayue d72eda83d9 * Optimize code. 2022-06-10 16:20:40 +08:00
mayue 9b76036761 * Optimize code. 2022-06-10 16:17:58 +08:00
mayue bf56790216 * Fix bug #22928. 2022-06-10 16:06:10 +08:00
hufangzhou 4385eab733 * Make the order of products in the product drop-down consistent with the product list. 2022-06-09 16:25:29 +08:00
孙广明 ecd7f1197f * Fix product order bug. 2022-06-09 14:48:56 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
zhouxudong 88e32db3a6 * Finish task #55623. 2022-06-01 01:42:38 +00:00
zhouxudong 71a55f5dcf * Finish task #55623. 2022-06-01 01:37:18 +00:00
liumengyi ab2294d0a4 * Fix bug #23007. 2022-05-26 17:08:15 +08:00
hufangzhou 80c73a6f83 * Finish task #54990. 2022-05-25 13:30:30 +08:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
liumengyi f473c18251 * Finish task #54319. 2022-05-19 09:44:50 +08:00
wangyidong e51b5309d1 * fix bug for api. 2022-05-16 14:17:36 +08:00
孙华伟 2a33fd3830 *Fix bug. 2022-05-13 17:32:26 +08:00
孙华伟 c8d4a93bbf *Optemizi the code 2022-05-13 17:28:39 +08:00
孙广明 a770924dcf Merge branch 'master' into 'sprint/189_mayue_task#53652' 
# Conflicts:
#   module/project/model.php
 2022-05-12 05:01:42 +00:00
liumengyi 0e18988f6a * Fix bug for close product. 2022-05-11 17:05:04 +08:00
mayue 98dcd7517f * Optimize code. 2022-05-11 06:38:46 +00:00
孙广明 da6ab52f7b Merge branch 'sprint/189_zhouxin_53658' into 'master' 
Sprint/189 zhouxin 53658

See merge request easycorp/zentaopms!3321
 2022-05-11 05:13:18 +00:00
zhouxin c78ab4be77 * Adjust code. 2022-05-11 03:24:49 +00:00
zhouxin c6ac480351 * Fix bug. 2022-05-11 03:05:13 +00:00
zhouxin 51ec6494a0 * Add comment. 2022-05-11 02:19:09 +00:00
zhouxin b015ea5c77 * Finish task #53658. 2022-05-11 01:53:10 +00:00
daitingting deb8d170a7 * Build operate menu for product. 2022-05-10 05:44:25 +00:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
mayue aeda6fbe78 * Fix bug #22064#22065. 2022-04-28 06:43:05 +00:00
朱金勇 4898f63820 Merge branch 'sprint/renying_Fixbug#21457' into 'master' 
Sprint/renying fixbug#21457

See merge request easycorp/zentaopms!3051
 2022-04-22 01:36:54 +00:00
tianshujie edbc8e5d0b * Fix bug #18060. 2022-04-21 15:52:57 +08:00
renying b32081bab7 Fixbug#21457 2022-04-21 09:27:36 +08:00
hufangzhou 54f2910885 * Fix bug #21875. 2022-04-20 13:44:23 +08:00
zenggang 76278f3ca8 * Fix bug#16732 2022-04-15 02:21:33 +00:00
Zongjun Lan 8ef47e9292 * fix bug *18722 2022-04-12 10:58:35 +08:00
sunjun 95b2c3317a *Fixbug_sunjun_17344 2022-04-08 10:11:16 +08:00
sunjun 7c540be4d7 *Fixbug_sunjun_17344 2022-04-08 09:37:49 +08:00
sunjun e64527e7a0 *Fixbug_sunjun_17344 2022-04-07 09:25:13 +08:00
sunjun 365f6718c4 *Fixbug #17344 2022-04-06 17:12:01 +08:00
孙广明 67e3a3b4c4 Merge branch 'sunhuawei_fixbug_15989' into 'master' 
Sunhuawei fixbug 15989

See merge request easycorp/zentaopms!2681
 2022-04-01 02:50:22 +00:00
zenggang d63710351c * Fix bug#11161 2022-04-01 02:06:20 +00:00