Commit Graph

187 Commits

Author SHA1 Message Date
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明
801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
zhujinyong
724d2ae39e * Format code style. 2021-11-23 14:28:49 +08:00
朱金勇
542adaa80d Merge branch 'spring/170_xiawenlong' into 'sprint/170'
* Fix create api doc Bug.

See merge request easycorp/zentaopms!599
2021-11-23 02:42:54 +00:00
xiawenlong
c8fd615b73 * Fix create api doc Bug. 2021-11-23 09:36:02 +08:00
hufangzhou
6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
zhujinyong
e7606af189 * Fix english language. 2021-11-22 09:59:21 +08:00
zhujinyong
0d7c8a5e2d * Add array type for params type. 2021-11-22 09:55:20 +08:00
zhujinyong
5f8c33d682 * Move chinese to $lang->api. 2021-11-22 08:10:05 +08:00
liyuchun
af1c32a406 * Fix bug #16208. 2021-11-12 08:43:50 +08:00
root
f49cbba01d * Fix bug #15665 2021-11-09 14:38:14 +08:00
hufangzhou
8b1b92bdfc * Add the version. 2021-11-02 12:37:51 +08:00
xiawenlong
0e03f7c478 finish 43676 2021-11-01 08:54:01 +08:00
liyuchun
886f54508f * Adjust style of api index. 2021-10-28 15:10:23 +08:00
xiawenlong
a4aef73aa6 * Finish Task #43676,43675,43672,43671,43679,43669 2021-10-28 14:41:31 +08:00
xiawenlong
3d52f403d0 * Finish Task #43624 2021-10-28 13:02:38 +08:00
reneeteng
cf5682ef5b * Edit api lang and related files. 2021-10-28 10:11:52 +08:00
mayue
b2ea4ec71f *Fix a bug #15741. 2021-10-27 14:39:57 +08: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
mayue
fdc33354fc *Fix a bug #15739 2021-10-26 15:01:14 +08:00
mayue
4e082eb883 *Fix a bug #15739 2021-10-26 14:48:54 +08:00
mayue
17118b4595 *Fix a bug #15739 2021-10-26 14:37:42 +08:00
xiawenlong
58116c1bbc * Finish task #43543. 2021-10-26 10:06:38 +08:00
liyuchun
5eb305f393 * Fix bug #15684. 2021-10-20 16:40:47 +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
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
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
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
朱金勇
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
xiawenlong
20fea2b68c delete debug code. 2021-10-19 19:07:20 +08:00
xiawenlong
5db2b168de fix code style. 2021-10-19 19:04:30 +08:00
zhujinyong
d6db6a965b Merge branch 'sprint/167' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/167 2021-10-19 18:57:36 +08:00