Merge branch 'feature/feature-test-2' of http://m.shuto.cn:8680/wuxiang/gftest.git into feature/feature-test-2

test feature 2
Merge branch 'develop' into feature/feature-test-2
2021-08-17 10:52:23 +08:00 · 2021-08-17 10:15:54 +08:00 · 2021-08-01 12:53:00 +08:00 · 2021-08-01 12:50:59 +08:00 · 2021-08-01 12:33:10 +08:00 · 2021-03-08 11:38:10 +08:00
4 changed files with 4 additions and 0 deletions
@@ -328,3 +328,4 @@ dist
 .yarn/build-state.yml
 .yarn/install-state.gz
 .pnp.*
+
@@ -0,0 +1 @@
+select count(*) from maxusers;
@@ -0,0 +1 @@
+this is test1
@@ -0,0 +1 @@
+feather test 2
Author	SHA1	Message	Date
wuxiang	65c98e1f24	Merge branch 'feature/feature-test-2' of http://m.shuto.cn:8680/wuxiang/gftest.git into feature/feature-test-2	2021-08-17 10:52:23 +08:00
wuxiang	4ca0f69301	test feature 2	2021-08-17 10:15:54 +08:00
wuxiang	56d1dfc3fb	Merge branch 'develop' into feature/feature-test-2	2021-08-01 12:53:00 +08:00
wuxiang	69cdf53a66	test 2	2021-08-01 12:50:59 +08:00
wuxiang	092898d603	Squashed commit of the following: commit 4b0001821fe057e8d5259ddf5cfdcc2a8b6c3665 Author: wuxiang <wuxiang@shuto.cn> Date: Sun Aug 01 12:32:45 2021 +0800 .project 加入 ignore commit 27536e77a805f5f75403e6a48b7ffef7f998c37c Author: wuxiang <wuxiang@shuto.cn> Date: Sun Aug 01 12:30:44 2021 +0800 test1	2021-08-01 12:33:10 +08:00
李祖建	6f295cfeef	Merge pull request '新增lizj测试文件' (#3 ) from featureA into develop Reviewed-on: http://m.shuto.cn:8680/wuxiang/gftest/pulls/3 Reviewed-by: 巫翔 <wuxiang@shuto.cn>	2021-03-08 11:38:10 +08:00