Commit Graph
2447 Commits
Author SHA1 Message Date
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00:00
wangyidong e51b5309d1 * fix bug for api. 2022-05-16 14:17:36 +08:00
孙广明 3bea91aa8d Merge branch 'fix_bug' into 'master'
*Fix bug #22397.

See merge request easycorp/zentaopms!3397
2022-05-13 09:34:14 +00:00
孙华伟 2a33fd3830 *Fix bug. 2022-05-13 17:32:26 +08:00
孙华伟 c8d4a93bbf *Optemizi the code 2022-05-13 17:28:39 +08:00
daitingting 137b6e6417 * Fix bug for printExtendFields in view file. 2022-05-13 03:10:08 +00:00
孙广明 a770924dcf Merge branch 'master' into 'sprint/189_mayue_task#53652'
# Conflicts:
#   module/project/model.php
2022-05-12 05:01:42 +00:00
孙广明 1ea33ead7d Merge branch 'sprint/189_zhouxin_22371' into 'master'
* Fix bug #22371.

See merge request easycorp/zentaopms!3351
2022-05-12 02:46:15 +00:00
zhouxin 3e2181dea0 * Fix bug #22371. 2022-05-12 02:44:37 +00:00
zhouxin 86344c7a65 * Fix bug #22361. 2022-05-12 01:35:53 +00:00
孙广明 5b67fec07c Merge branch 'sprint/189_zhouxin_53656' into 'master'
* Fix bug #53656.

See merge request easycorp/zentaopms!3344
2022-05-11 09:17:06 +00:00
liumengyi 0e18988f6a * Fix bug for close product. 2022-05-11 17:05:04 +08:00
zhouxin 160c0fbcaa * Fix bug #53656. 2022-05-11 08:13:06 +00:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +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 fe6b01a440 * Adjust code. 2022-05-11 02:41:05 +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
xieqiyu b6650b012f * Fix bug#22117. 2022-04-29 14:05:22 +08:00
mayue aeda6fbe78 * Fix bug #22064#22065. 2022-04-28 06:43:05 +00:00
hufangzhou 1acb25fc6c * Fix bug #17335. 2022-04-24 11:02:17 +08:00
mayue b625c5e1f2 * Fix bug #21706. 2022-04-22 16:05:13 +08:00
hufangzhou 98153aa83b * Rename the variable. 2022-04-22 15:37:10 +08:00
hufangzhou 0c57308663 * Fix bug #18167. 2022-04-22 15:29:27 +08: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
xieqiyu 4d65e01a38 * Fix bug#2442. 2022-04-22 09:00:55 +08:00
李玉春 59108747ce Merge branch 'sprint/tianshujie_18060' into 'master'
Sprint/tianshujie 18060

See merge request easycorp/zentaopms!3061
2022-04-21 08:55:43 +00:00
tianshujie edbc8e5d0b * Fix bug #18060. 2022-04-21 15:52:57 +08:00
zhouxin 8ec6de5fb5 * Fix bug #2296,#1832. 2022-04-21 05:50:05 +00:00
renying d02cb94ab6 Fixbug#21457 2022-04-21 10:41:24 +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
renying d219dac730 Fix bug#17274 2022-04-14 14:37:10 +08:00
王怡栋 97f9ee3297 Merge branch 'fixbugs_zhouxin_21374' into 'master'
* Fix bug #21374.

See merge request easycorp/zentaopms!2922
2022-04-13 08:05:44 +00:00
zhouxin 6e6deaa462 * Fix bug #21374. 2022-04-13 07:59:57 +00:00
孙华伟 df57c95636 *Fix bug#21668 2022-04-13 09:59:37 +08:00
孙广明 d82b552898 Merge branch 'fixbugs_zhouxin_21374' into 'master'
* Fix bug #21374.

See merge request easycorp/zentaopms!2893
2022-04-12 07:52:52 +00:00
孙广明 92eb57d9ef Merge branch 'shunhuawei_fixbug_21488' into 'master'
*Beautify the interface.

See merge request easycorp/zentaopms!2894
2022-04-12 07:50:54 +00:00
孙华伟 6c85c8f49c *Beautify the interface. 2022-04-12 15:47:01 +08:00
zhouxin 125fa381fc * Fix bug #21374. 2022-04-12 07:40:28 +00:00
孙广明 1e86d0872a Merge branch 'shunhuawei_fixbug_21488' into 'master'
Shunhuawei fixbug 21488

See merge request easycorp/zentaopms!2879
2022-04-12 06:44:47 +00:00
孙华伟 03cf60bdcb *project,execution,bug have the same problem. 2022-04-12 14:26:12 +08:00