862 Commits

Include renames

Author	SHA1	Message	Date
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
tanghucheng	714dffe615	* Fix bug for bug export.	2022-09-14 14:42:44 +08:00
tianshujie	226029f1e5	* Fix bug #27451.	2022-09-09 16:34:08 +08:00
tianshujie	b5630098eb	* Fix bug #27449.	2022-09-09 16:10:34 +08:00
xieqiyu	dfe4de62a5	* Fix bug#26179.	2022-09-09 14:14:53 +08:00
xieqiyu	5c3ff64ce7	* Code for task#67691.	2022-09-08 11:14:53 +08:00
xieqiyu	97b4bb9487	* Code for task#67691.	2022-09-08 11:03:44 +08:00
xieqiyu	592a109bed	* Code for task#67691.	2022-09-08 09:09:03 +08:00
lanzongjun	f7922c8c70	* fix bug #27198	2022-09-05 11:03:26 +08:00
xieqiyu	6bcc09aeca	* Fix bug#27244.	2022-09-02 14:42:22 +08:00
lanzongjun	91da8c65f6	remove feedback action	2022-09-02 13:17:27 +08:00
王怡栋	58c0d43da5	Merge branch 'master_xieqiyu_66955' into 'master' ... Master xieqiyu 66955 See merge request easycorp/zentaopms!5219	2022-09-01 03:05:12 +00:00
xieqiyu	16094e64d4	* Optimize code.	2022-09-01 11:04:08 +08:00
xieqiyu	d552aa67f9	* Code for task#66955.	2022-09-01 10:47:58 +08:00
lanzongjun	07c97f4072	modify processed	2022-09-01 09:40:57 +08:00
lanzongjun	71cd04f05d	modify processed	2022-09-01 09:37:59 +08:00
lanzongjun	11ace1e2da	Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug	2022-09-01 09:11:23 +08:00
lanzongjun	1a65713332	* finish task #66992	2022-09-01 09:11:10 +08:00
xieqiyu	e6bc611d14	* Finish task#66955.	2022-08-31 19:20:02 +08:00
xieqiyu	b026b7c494	* Code for task#66955.	2022-08-31 18:27:42 +08:00
李玉春	0bc581b21c	Merge branch 'sprint/235' into 'master' ... Sprint/235 See merge request easycorp/zentaopms!5216	2022-08-31 08:19:32 +00:00
tianshujie	b9190b8d92	* Solve bug link bug search all products reported errors.	2022-08-30 15:14:36 +08:00
lanzongjun	c26a7c3a3a	* fix bug #26990	2022-08-29 13:28:13 +08:00
zenggang	494474d349	* Fix sprint231 bugs	2022-08-26 05:10:26 +00:00
王怡栋	297a416762	Merge branch 'master' into 'sprint/231_zg_65782' ... # Conflicts: # module/story/control.php	2022-08-25 00:51:00 +00:00
王怡栋	00b8ffc6f7	Merge branch 'sprint/unittest_liumengyi_bug' into 'master' ... * Unit test of bug. See merge request easycorp/zentaopms!4993	2022-08-24 05:47:55 +00:00