Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,947 Commits 2 Branches 292 Tags
d48ae97cf03b1665ef3ad68effea78db46db8dcb
Commit Graph
887 Commits
Author SHA1 Message Date
孙广明 cb6a64eede Merge branch 'master_bug_30609' into 'master' 
* Fix bug #30609.

See merge request easycorp/zentaopms!6511
 2022-12-09 08:56:19 +00:00
lanzongjun dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00
liuhong 1001e35d9b * Fix bug #30609. 2022-12-08 16:38:50 +00:00
liuhong a3893c9046 *Adjuct code for task #78696. 2022-12-06 05:11:07 +00:00
liuhong 377ba07d06 * Fix task code for #78696. 2022-12-06 03:28:33 +00:00
liuhong 925367c9ca * Adjust code for task #78696. 2022-12-06 02:04:47 +00:00
liuhong 346173fcd9 * Fix task #78696. 2022-12-05 05:57:08 +00:00
wangyidong 283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
孔令茂 0b298bf63c * Resolved feedback #1514,add execution linkage when project empty. 2022-11-29 13:20:50 +00:00
zenggang d76f5da235 * Fix bug#26556 2022-11-23 07:49:01 +00:00
zenggang 4609340b65 * Fix bug#29765 2022-11-23 05:09:52 +00:00
王怡栋 3b6b770d72 * fix bug #30068. 2022-11-22 09:45:05 +08:00
王怡栋 1c0129945c * code for task #76439,76440. 2022-11-18 14:25:24 +08:00
王怡栋 6425496407 Merge branch 'zentaopms261_wyd' 2022-11-17 09:55:27 +08:00
王怡栋 6c0a92fa65 * adjust for sync build to release. 2022-11-17 09:40:51 +08:00
王怡栋 0fdbf58dc9 * adjust code. 2022-11-16 17:09:07 +08:00
王怡栋 f4452f6d04 * fix for link story and bug for project release. 2022-11-16 17:06:12 +08:00
liuhong d7f9d55863 * Resolved feedback #1422. 2022-11-15 02:15:12 +00:00
王怡栋 72ad339e22 Merge branch 'zentaopms_258_task#76032' into 'master' 
Zentaopms 258 task#76032

See merge request easycorp/zentaopms!6138
 2022-11-14 09:06:29 +00:00
王怡栋 af8098e545 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-14 16:20:31 +08:00
王怡栋 27086ff4a2 * fix bug. 2022-11-14 16:20:23 +08:00
wangyuting bb5b3426f6 * Finish task #76032. 2022-11-14 07:55:25 +00:00
王怡栋 e97e7ab9b5 * code for task #76034,76033. 2022-11-14 14:34:07 +08:00
wangyidong 8a178c72fe * adjust for project release link story and bug. 2022-11-11 10:47:01 +08:00
tanghucheng e09a070318 * Merge branch 'master' into transfer. 2022-11-09 15:44:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 829408cc5e * Hide pri style when value is null. 2022-11-04 08:37:35 +08:00
zhouxin 66fef9275a * Adjust code. 2022-11-02 15:50:38 +08:00
zhouxin 73e1c524c8 * Adjust testcase to bug. 2022-11-02 15:42:21 +08:00
liuyongkai 9685f4b186 * Resolve feedback #1318. 2022-11-01 07:31:11 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
zenggang 3237e4e752 * Fix bug#28542 2022-10-17 05:22:40 +00:00
mayue 97aaafbbc3 * Remove ticket from bug. 2022-10-17 09:01:15 +08:00
liugang 986b7ff785 * Fix bug #27906. 2022-10-10 13:32:00 +08:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
sunguangming 7efbb7d6ca * Fix bug #28227. 2022-10-08 17:02:01 +08:00
wangyidong b670a47863 * fix bug #27958. 2022-10-08 15:32:49 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
sunguangming 89a72fc20e * Code for bug export bug. 2022-09-29 13:53:54 +08:00
liugang 9429a88213 * Finish task #70753. 2022-09-26 14:16:46 +08:00
xieqiyu eed9d18857 * Fix bug#27359. 2022-09-23 09:02:39 +00:00
tianshujie 6a7c69e14e * Finish task #70008. 2022-09-23 10:22:32 +08:00
liugang b1944e6514 * Fix bug of passed error param when call the getPairs method of the product module. 2022-09-22 13:54:35 +08:00
tianshujie 073c3fc987 * Finish task #70008. 2022-09-22 10:27:55 +08:00
tianshujie a8bdc9bc6c * Finish task #70008. 2022-09-22 09:07:11 +08:00
sunguangming e78b1c4331 * Code for task #69595. 2022-09-21 13:22:17 +08:00
sunguangming 262bc3c572 * Merge code. 2022-09-21 11:00:20 +08:00
wangyidong 78d1de70c2 * code for task #69248. 2022-09-16 16:28:50 +08:00