Commit Graph
30913 Commits
Author SHA1 Message Date
李玉春 c80b8d09e0 Merge branch 'sgm_45818' into 'kanban'
* Code for task #45818.

See merge request easycorp/zentaopms!854
2021-12-09 06:36:48 +00:00
孙广明 ad53ead5ba * Fix code details. 2021-12-09 14:33:23 +08:00
孙广明 b7480bb257 Merge branch 'sprint/30_zhouxin_45792' into 'kanban'
Finish task #45792.

See merge request easycorp/zentaopms!844
2021-12-09 06:19:40 +00:00
孙广明 9824f4c6ac * Code for task #45818. 2021-12-09 14:11:49 +08:00
孙广明 12ce541d9e * Code for task #45818. 2021-12-09 10:50:05 +08:00
xieqiyu 8298f778e7 * Fix bug#17251. 2021-12-09 10:34:47 +08:00
hufangzhou 1517a800e2 * Fix an error for lang item. 2021-12-09 10:34:47 +08:00
tianshujie 2030bbd11c * Fix bug #17173. 2021-12-09 10:34:47 +08:00
hufangzhou c7d5310496 * Fix bug #16792. 2021-12-09 10:34:47 +08:00
hufangzhou 5287e87410 * Fix bug #17276. 2021-12-09 10:34:47 +08:00
hufangzhou 0d7f5f6e2d * Adjust the code. 2021-12-09 10:34:47 +08:00
hufangzhou e408f91d1f * Fix bug #17269, bug #16975. 2021-12-09 10:34:47 +08:00
tianshujie ec5d481dc8 * Fix bug #17272. 2021-12-09 10:34:47 +08:00
mayue 559c3879c3 * Optimize code #17248,17246. 2021-12-09 10:34:47 +08:00
tianshujie 7c3a8dc753 * Fix bug #17259. 2021-12-09 10:34:47 +08:00
mayue 1111d59ed9 * Fix bug #17248,17246. 2021-12-09 10:34:47 +08:00
mayue 147470bf29 * Fix bug #17248,17246. 2021-12-09 10:34:47 +08:00
hufangzhou b2336fc180 * Fix bug #17263. 2021-12-09 10:34:47 +08:00
xieqiyu 4be580309c * Fix bug#17251. 2021-12-09 10:34:47 +08:00
tianshujie d33c071177 * Fix bug #17259. 2021-12-09 10:34:47 +08:00
xieqiyu 9f168793fe * Fix bug#17267. 2021-12-09 10:34:47 +08:00
hufangzhou 83cc442fc3 * Fix bug #17261. 2021-12-09 10:34:47 +08:00
孙广明 eb3005cb9b * Fix program kanban error. 2021-12-09 10:34:47 +08:00
tianshujie 33971a4671 * Fix bug #17243. 2021-12-09 10:34:47 +08:00
孙广明 9db7d96139 * Fix kanban bug. 2021-12-09 10:34:47 +08:00
孙广明 44bbe31440 * Fix kanban bug. 2021-12-09 10:34:47 +08:00
xieqiyu ddea40c56a * Modify style. 2021-12-09 10:34:47 +08:00
xieqiyu 6aca5f10c0 * Delete unused code. 2021-12-09 10:34:47 +08:00
tianshujie 6219e2323b * Fix bug #17208. 2021-12-09 10:34:47 +08:00
孙广明 14b272a1af * Merge 169 untrack file to master. 2021-12-09 10:34:47 +08:00
hufangzhou 32c7a078a7 * Fix the code error. 2021-12-09 10:34:47 +08:00
tianshujie 74958bd6b2 * Fix bug #17208. 2021-12-09 10:34:47 +08:00
liumengyi f0e55ad2a4 * Fix bug #17227. 2021-12-09 10:34:47 +08:00
tianshujie 8e7432ad08 * Fix bug #17173,17173. 2021-12-09 10:34:47 +08:00
xieqiyu 47c2000914 * Fix bug#17193. 2021-12-09 10:34:47 +08:00
tanghucheng 7458b8ef92 * Fix bug #17225. 2021-12-09 10:34:47 +08:00
李玉春 30aa071426 Revert "Merge branch 'sprint/devops16_liyuchun_45491' into 'master'"
This reverts merge request !803
2021-12-09 10:34:47 +08:00
liyuchun 76748224eb * Finish task #45491. 2021-12-09 10:34:47 +08:00
hufangzhou 32601cd5ff * Fix bug #17185. 2021-12-09 10:34:47 +08:00
xieqiyu 8aac5aea93 * Fix bug#17113. 2021-12-09 10:34:47 +08:00
xieqiyu 408eb2d44f * Fix bug#17188. 2021-12-09 10:34:47 +08:00
hufangzhou 3a84e87d55 * Modify the apistruct table field. 2021-12-09 10:34:47 +08:00
hufangzhou a60e642d0e * Modify the editedBy field in zt_apistruct table and add the standard sql. 2021-12-09 10:34:47 +08:00
tanghucheng 70e124b9ef * Fix bug #17126. 2021-12-09 10:34:47 +08:00
tanghucheng bca881ebec * Fix bug #17126. 2021-12-09 10:34:47 +08:00
孙广明 76d0034f59 Merge branch 'sprint/177_tianshujie_45815' into 'kanban'
* Finish task #45815.

See merge request easycorp/zentaopms!843
2021-12-09 02:33:31 +00:00
tianshujie 7710b314bd * Modify the code. 2021-12-09 10:28:20 +08:00
liumengyi 7869ec56e5 * Modify edit space HTML file. 2021-12-09 10:06:04 +08:00
liumengyi 93e7a57bf5 * Remove unwanted empty lines. 2021-12-09 09:09:46 +08:00
liumengyi 15e26d6794 * Delete unwanted files,and add edit space file. 2021-12-09 09:06:35 +08:00