Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
48,948 Commits 2 Branches 292 Tags
fd30e0a0062bb94de6cf1dba4af552da316bbc71
Commit Graph
3645 Commits
Author SHA1 Message Date
liuhong fd30e0a006 * Finish task #79667. 2022-12-14 04:49:43 +00:00
liuhong 33d35425cc * Adjust code for task #79667. 2022-12-14 04:40:20 +00:00
liuhong 95056fd6cd * draft code task #79667. 2022-12-14 04:09:51 +00:00
xieqiyu 455e7af0da * Code for task#79672. 2022-12-13 17:08:30 +08:00
lanzongjun 493910031a * Finish Task #79466 2022-12-13 09:45:01 +08:00
lanzongjun 0a492b61fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-13 09:08:08 +08:00
Yagami de6e9b07ac * Code for function review. 2022-12-12 16:11:03 +08:00
lanzongjun 295bfadc5b * Finish Task #79671 2022-12-12 15:38:55 +08:00
lanzongjun 835577a6f0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-12 14:17:14 +08:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
lanzongjun ad203dfbf9 * Finish Task #79450 2022-12-12 13:25:39 +08:00
Yagami b70f00842f * Finish task #79462. 2022-12-12 10:01:40 +08:00
孙广明 8981507e80 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master' 
* Fix Bug #30637#30662#78695#78688

See merge request easycorp/zentaopms!6515
 2022-12-09 06:48:13 +00:00
lanzongjun dd2160fde3 * Finish Bug #30662 2022-12-09 11:53:58 +08:00
lanzongjun 8a0cbc6e6d * Finish Bug #30637 2022-12-09 09:41:06 +08:00
zenggang 3d676b613a * Fix bug#30719 2022-12-09 00:59:17 +00:00
mayue 9b7c5be5ca * Finish feedback#130 and story#32666. 2022-12-08 14:46:33 +08:00
xieqiyu a7b96c881a * Fix bug#30644. 2022-12-08 12:36:50 +08:00
xieqiyu 80af5ddba5 * Finish task#78690. 2022-12-08 10:06:46 +08:00
lanzongjun 29d8ff292a * Finish Task #78697 2022-12-07 15:17:35 +08:00
lanzongjun 55aac8c426 * Finish Task #78664 2022-12-06 16:51:58 +08:00
lanzongjun 0adbd8e27a * Finish Bug #30541 2022-12-06 10:16:34 +08:00
lanzongjun bc2bceb7a7 * Finish Bug #30543 2022-12-06 09:36:36 +08:00
Yagami 3c60e62afa * Finish task #78692. 2022-12-05 14:03:26 +08:00
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
兰宗俊 94157d4c10 Merge branch 'sprint/zentaopms256_lanzongjun' into 'zentaopms_256' 
fix change product text missing

See merge request easycorp/zentaopms!6443
 2022-12-01 08:15:53 +00:00
lanzongjun 542cd36946 fix change product text missing 2022-12-01 16:14:56 +08:00
孙广明 1caccc3696 Merge branch 'sprint/zentaopms268_mayue_bug#30373' into 'zentaopms_256' 
* Fix bug #30373.

See merge request easycorp/zentaopms!6438
 2022-12-01 06:31:11 +00:00
mayue f7c3965d57 * Fix bug #30373. 2022-12-01 14:23:39 +08:00
lanzongjun 1651a1492e edit story fix empty 2022-12-01 14:23:31 +08:00
lanzongjun 7535a68128 rollback code 2022-12-01 14:07:43 +08:00
lanzongjun 658144ab3a master branch only relation master plan 2022-12-01 14:04:55 +08:00
lanzongjun 315dc16980 master branch only relation master plan 2022-12-01 14:04:26 +08:00
lanzongjun aff72c1c26 * fix bug #30402 2022-12-01 09:44:04 +08:00
lanzongjun 65fe5985a2 code meeting fix 2022-12-01 08:29:35 +08:00
lanzongjun b1831623e5 * Finish Task #77806 2022-11-30 15:16:44 +08:00
mayue 3636439554 * Finish task #77805. 2022-11-29 16:15:22 +08:00
Yagami 5888ca9b97 * Code for task #77807. 2022-11-29 09:25:08 +08:00
liuyongkai 9455b09e17 * Resolve feedback #1459. 2022-11-28 14:55:02 +08:00
liuyongkai 64fb4c10ca * Resolve feedback #1459. 2022-11-28 14:15:58 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
tanghucheng 8f20075c51 * Fix bug #30282. 2022-11-25 16:12:51 +08:00
mayue fc4abe395d * Fix bug #30096. 2022-11-24 16:10:19 +08:00
mayue c0879ef983 * Fix bug #30021. 2022-11-23 16:16:06 +08:00
xieqiyu 37122bb5a8 * Fix bug#30056. 2022-11-23 09:34:21 +08:00
lanzongjun a11d496c0b * Fix Task #77261 2022-11-22 16:55:48 +08:00
lanzongjun 314ab3224a * Fix Task #77261 2022-11-22 16:54:01 +08:00
lanzongjun 1d4a337af8 * Fix Task #77262 2022-11-22 16:49:32 +08:00
lanzongjun 284b748e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-22 15:45:19 +08:00
lanzongjun 740e3e673b * Fix Task #77260 2022-11-22 15:35:34 +08:00