Commit Graph
24442 Commits
Author SHA1 Message Date
tianshujie 9fac2ea22e * Fix bug #43540. 2021-10-27 13:50:27 +08:00
李玉春 e565ab289a Merge branch 'sprint/169_mayue_15712' into 'sprint/169'
*Fix a bug #15712

See merge request easycorp/zentaopms!164
2021-10-27 00:57:38 +00:00
mayue 131b428d20 *Fix a bug #15712 2021-10-26 18:20:14 +08:00
王怡栋 014bf4f068 Merge branch 'sprint/169_liugang_bug' into 'sprint/169'
Remove the outdated code and fix return value.

See merge request easycorp/zentaopms!152
2021-10-26 07:31:50 +00:00
孙广明 dd2657b9a1 Merge branch 'spring/169/xiawenlong' into 'sprint/169'
Spring/169/xiawenlong

See merge request easycorp/zentaopms!156
2021-10-26 07:31:25 +00:00
xiawenlong d4f7c938c1 rollback code. 2021-10-26 15:26:05 +08:00
李玉春 c7f185503c Merge branch 'sprint/169_mayue_15739' into 'sprint/169'
*Fix a bug #15739

See merge request easycorp/zentaopms!150
2021-10-26 07:12:32 +00:00
mayue fdc33354fc *Fix a bug #15739 2021-10-26 15:01:14 +08:00
liugang dd729bb202 * Fix return value. 2021-10-26 14:55:15 +08:00
mayue 4e082eb883 *Fix a bug #15739 2021-10-26 14:48:54 +08:00
tanghucheng aa9aeb37b0 * Finish task #43549. 2021-10-26 14:48:32 +08:00
mayue 17118b4595 *Fix a bug #15739 2021-10-26 14:37:42 +08:00
xiawenlong 9edd374612 * Finish task #43551. 2021-10-26 14:06:45 +08:00
xiawenlong 58116c1bbc * Finish task #43543. 2021-10-26 10:06:38 +08:00
孙广明 aad6d4c76a Merge branch 'spirnt/167_liyuchun_15164' into 'sprint/167'
* Fix bug #15164.

See merge request easycorp/zentaopms!138
2021-10-22 03:14:47 +00:00
liyuchun 28a87df599 * Fix bug #15164. 2021-10-22 11:11:10 +08:00
hufangzhou bf6b658810 * Fix bug #15717. 2021-10-22 08:45:02 +08:00
tianshujie 69743fa3a4 * Fix bug #15698. 2021-10-21 08:32:55 +08:00
liyuchun d92c073cb5 * Fix bug #15684. 2021-10-20 17:08:53 +08:00
liyuchun 5eb305f393 * Fix bug #15684. 2021-10-20 16:40:47 +08:00
liyuchun fce0f3aafa * Fix bug #15592. 2021-10-20 16:04:44 +08:00
孙广明 a3948383f8 Merge branch 'sprint/167_api_doc' into 'sprint/167'
* Fix bug #15674.

See merge request easycorp/zentaopms!124
2021-10-20 07:40:43 +00:00
tianshujie eaaed9cfe6 * Fix bug #15679. 2021-10-20 15:32:02 +08:00
liyuchun 3f279a9ec1 * Fix bug #15674. 2021-10-20 15:00:11 +08:00
朱金勇 53cccbed9f Merge branch 'sprint/167_api_doc' into 'sprint/167'
fix many subfiled bug

See merge request easycorp/zentaopms!122
2021-10-20 05:59:34 +00:00
hufangzhou e912a03df7 * Fix bug #15673. 2021-10-20 13:50:51 +08:00
xiawenlong 902d24ff14 fix code style 2021-10-20 13:48:18 +08:00
xiawenlong e5cac550f5 fix many subfield bug. 2021-10-20 13:39:58 +08:00
liyuchun 2fb6e09218 * Fix bug #15663. 2021-10-20 11:18:10 +08:00
hufangzhou 02f2bd22c6 * Fix bug #15669. 2021-10-20 11:07:24 +08:00
hufangzhou 409f2936cb * Fix bug #15666. 2021-10-20 10:21:38 +08:00
hufangzhou 8024914da1 * Fix bug #15652. 2021-10-20 09:26:52 +08:00
hufangzhou e3fc0a1bf5 * Adjust the lang file. 2021-10-19 21:00:11 +08:00
xiawenlong 50ea48702e fix api lib default access control 2021-10-19 20:51:13 +08:00
朱金勇 2b04f2ba14 Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
fix default body type.

See merge request easycorp/zentaopms!118
2021-10-19 12:42:52 +00:00
zhujinyong 20c2314588 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 20:41:10 +08:00
李玉春 724588ee19 Merge branch 'sprint/167_tianshujie_15638' into 'sprint/167'
* Fix bug #15638.

See merge request easycorp/zentaopms!115
2021-10-19 12:40:58 +00:00
xiawenlong f02595167f fix default body type. 2021-10-19 20:40:26 +08:00
liyuchun a2163a67d0 * Add auth of api. 2021-10-19 20:37:36 +08:00
liyuchun 9e83958e1c * Adjust order of change log. 2021-10-19 20:34:59 +08:00
liyuchun b32541f20f * Fix bug #15639. 2021-10-19 20:32:06 +08:00
liyuchun 8c12096a92 * Fix bug #15639. 2021-10-19 20:23:19 +08:00
tianshujie 0b7c4c5f1c * Fix bug #15638. 2021-10-19 20:18:42 +08:00
hufangzhou 24795122b8 * Check the api module for package. 2021-10-19 20:12:57 +08:00
tianshujie adef615386 * Fix bug #15638. 2021-10-19 19:41:05 +08:00
朱金勇 ef970d5005 Merge branch 'spirnt/167_liyuchun_15636' into 'sprint/167'
* Fix bug #15636.

See merge request easycorp/zentaopms!113
2021-10-19 11:19:28 +00:00
liyuchun a2b3fe0ff1 * Fix bug #15636. 2021-10-19 19:17:15 +08:00
zhujinyong f17a9bd5f6 Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 19:10:01 +08:00
朱金勇 3bebe533db Merge branch 'sprint/167_xiawenlong' into 'sprint/167'
fix code style.

See merge request easycorp/zentaopms!112
2021-10-19 11:09:40 +00:00
xiawenlong 1251aa587a delete debug code. 2021-10-19 19:09:04 +08:00