Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
30,882 Commits 2 Branches 292 Tags
545652e0e409cfff5cfecb5ac631b6050f100966
Commit Graph
30882 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tianshujie 545652e0e4 * Fix bug #17259. 2021-12-08 16:50:48 +08:00
tianshujie 37a65b6789 * Fix bug #17259. 2021-12-08 16:10:09 +08:00
李玉春 c62ce9a159 Merge branch 'sgm_fixbug' into 'master' 
* Fix program kanban error.

See merge request easycorp/zentaopms!829
 2021-12-08 07:43:41 +00:00
孙广明 a2d79091cc Merge branch 'sprint/174_hufangzhou_17261' into 'master' 
* Fix bug #17261.

See merge request easycorp/zentaopms!832
 2021-12-08 07:32:20 +00:00
hufangzhou b1bca8dac0 * Fix bug #17261. 2021-12-08 15:29:13 +08:00
孙广明 114629ec8d Merge branch 'sprint/master_tanghucheng_project' into 'master' 
* Fix bug #17126.

See merge request easycorp/zentaopms!797
 2021-12-08 07:08:40 +00:00
孙广明 7f7533c521 * Fix program kanban error. 2021-12-08 13:47:24 +08:00
李玉春 986bd09df8 Merge branch 'sprint/174_tianshujie_17243' into 'master' 
* Fix bug #17243.

See merge request easycorp/zentaopms!828
 2021-12-08 05:40:07 +00:00
tianshujie f0d7855414 * Fix bug #17243. 2021-12-08 13:36:22 +08:00
李玉春 0c4f0dc504 Merge branch 'sgm_fixbug' into 'master' 
* Fix kanban bug.

See merge request easycorp/zentaopms!823
 2021-12-08 05:10:01 +00:00
孙广明 c1f2a2272f * Fix kanban bug. 2021-12-08 13:08:28 +08:00
孙广明 74cfe9aa75 * Fix kanban bug. 2021-12-08 11:33:34 +08:00
孙广明 5d02d686cd Merge branch 'sprint/xieqiyu_deleteUnsedCode' into 'master' 
* Delete unused code.

See merge request easycorp/zentaopms!822
 2021-12-08 03:28:35 +00:00
xieqiyu 6d6d5fa258 * Modify style. 2021-12-08 11:27:47 +08:00
孙广明 2e614c7d2f Merge branch 'sprint/174_tianshujie_17208' into 'master' 
* Fix bug #17208.

See merge request easycorp/zentaopms!816
 2021-12-08 03:22:22 +00:00
xieqiyu b638ad51c1 * Delete unused code. 2021-12-08 11:15:32 +08:00
王怡栋 69185d7fb8 Merge branch 'sgm_mergecode' into 'master' 
* Merge 169 untrack file to master.

See merge request easycorp/zentaopms!821
 2021-12-08 03:12:32 +00:00
tianshujie 2e6414cc8f * Fix bug #17208. 2021-12-08 11:11:12 +08:00
孙广明 13f162edd2 * Merge 169 untrack file to master. 2021-12-08 11:07:06 +08:00
孙广明 87c24eae5a Merge branch 'sprint/174_hufangzhou_action' into 'master' 
* Fix the code error.

See merge request easycorp/zentaopms!817
 2021-12-08 00:55:02 +00:00
hufangzhou 5c53afeeed * Fix the code error. 2021-12-08 08:47:00 +08:00
孙广明 6300b9d804 Merge branch 'sprint/175_liumengyi_17227' into 'master' 
* Fix bug #17227.

See merge request easycorp/zentaopms!815
 2021-12-08 00:46:17 +00:00
tianshujie bca286c0aa * Fix bug #17208. 2021-12-08 08:44:41 +08:00
liumengyi 07cd32ed75 * Fix bug #17227. 2021-12-07 18:11:43 +08:00
孙广明 834684ca51 Merge branch 'sprint/174_tianshujie_17173' into 'master' 
* Fix bug #17173,17173.

See merge request easycorp/zentaopms!812
 2021-12-07 09:24:13 +00:00
tianshujie 4fdb7107dc * Fix bug #17173,17173. 2021-12-07 17:22:14 +08:00
孙广明 29fef7581b Merge branch 'sprint/master_tanghucheng_17225' into 'master' 
* Fix bug #17225.

See merge request easycorp/zentaopms!810
 2021-12-07 09:20:26 +00:00
孙广明 ece705aafa Merge branch 'sprint/xieqiyu_fixbug_17193' into 'master' 
* Fix bug#17193.

See merge request easycorp/zentaopms!811
 2021-12-07 09:20:10 +00:00
xieqiyu b41aa8a4ef * Fix bug#17193. 2021-12-07 17:18:40 +08:00
tanghucheng 6f6dc4741a * Fix bug #17225. 2021-12-07 17:13:23 +08:00
王怡栋 0d6f17536c Merge branch 'revert-ff06288d' into 'master' 
Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"

See merge request easycorp/zentaopms!808
 2021-12-07 08:52:26 +00:00
李玉春 3f2793e5bd Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'" 
This reverts merge request !803
 2021-12-07 08:50:57 +00:00
王怡栋 ff06288dc8 Merge branch 'sprint/devops16_liyuchun_45491' into 'master' 
* Finish task #45491.

See merge request easycorp/zentaopms!803
 2021-12-07 08:21:33 +00:00
liyuchun b11dd3af4e * Finish task #45491. 2021-12-07 16:15:21 +08:00
李玉春 ee97446441 Merge branch 'sprint/174_hufangzhou_xuanxuan' into 'master' 
* Fix bug #17185.

See merge request easycorp/zentaopms!802
 2021-12-07 07:33:22 +00:00
李玉春 8fe0d5ddd4 Merge branch 'sprint/174_xieqiyu_17113' into 'master' 
* Fix bug#17113.

See merge request easycorp/zentaopms!800
 2021-12-07 07:27:49 +00:00
李玉春 69a74c1e4b Merge branch 'sprint/xieqiyu_fixbug_17188' into 'master' 
* Fix bug#17188.

See merge request easycorp/zentaopms!799
 2021-12-07 07:26:22 +00:00
hufangzhou 9359d427f5 * Fix bug #17185. 2021-12-07 15:25:31 +08:00
xieqiyu f22631ac2a * Fix bug#17113. 2021-12-07 14:56:10 +08:00
xieqiyu bccefb7751 * Fix bug#17188. 2021-12-07 14:22:56 +08:00
朱金勇 847071497d Merge branch 'sprint/174_hufangzhou_sql' into 'master' 
* Modify the editedBy field in zt_apistruct table and add the standard sql.

See merge request easycorp/zentaopms!798
 2021-12-07 05:24:43 +00:00
hufangzhou b8197551ef * Modify the apistruct table field. 2021-12-07 13:23:39 +08:00
hufangzhou 68b7073f9e * Modify the editedBy field in zt_apistruct table and add the standard sql. 2021-12-07 11:15:47 +08:00
zhujinyong e5873a07e0 + Add demo lib for api. 2021-12-07 11:06:56 +08:00
tanghucheng 8afc0024e0 * Fix bug #17126. 2021-12-07 10:07:02 +08:00
tanghucheng 5d1da3d0f5 * Fix bug #17126. 2021-12-07 09:33:52 +08:00
王怡栋 8cca6a3e33 Merge branch 'sprint/174_hufangzhou_package' into 'master' 
* Add the traditional Chinese language item.

See merge request easycorp/zentaopms!796
 2021-12-07 01:25:08 +00:00
hufangzhou d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
李玉春 192cbfd23a Merge branch 'sprint/175_sgm_fixbug' into 'master' 
* Fix project name check unique logic.

See merge request easycorp/zentaopms!793
zentaopms_16.0.beta1_20211207 		2021-12-07 00:56:27 +00:00
tanghucheng 1ee592147a * Fix programplan lang. 2021-12-07 08:41:51 +08:00