|
|
@@ -0,0 +1,310 @@
|
|
|
+[33mcommit d3c0f0b2a0187f5c4e140b9e3183564df47e43cc[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m)[m
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Mon Feb 14 10:47:11 2022 +0800
|
|
|
+
|
|
|
+ wms
|
|
|
+
|
|
|
+[33mcommit a495e8eb2b364522b84d2578133fd04a742793e6[m
|
|
|
+Merge: 6645c47 d294f39
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Mon Feb 14 10:07:35 2022 +0800
|
|
|
+
|
|
|
+ wms 修改
|
|
|
+
|
|
|
+[33mcommit 6645c47205116802a89bd250ca98b50616485eb7[m
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Sat Jan 22 19:46:04 2022 +0800
|
|
|
+
|
|
|
+ 倒垛
|
|
|
+
|
|
|
+[33mcommit d294f39e121bbe026ad2429a8f02d07a6b27dd84[m
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Sat Jan 22 19:39:50 2022 +0800
|
|
|
+
|
|
|
+ tj
|
|
|
+
|
|
|
+[33mcommit 21537f95346ddf1d8ae54b595f4f1f52c6c0c8bf[m
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Sat Jan 22 19:27:45 2022 +0800
|
|
|
+
|
|
|
+ tijiao
|
|
|
+
|
|
|
+[33mcommit 4999feba08b16af8d25572dbbf361d8ad3993945[m
|
|
|
+Merge: 5f5ff42 4b892bd
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Sat Jan 22 19:14:10 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API
|
|
|
+
|
|
|
+[33mcommit 5f5ff428fbecaba18deafd903bb0946defb71d60[m
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Sat Jan 22 19:13:31 2022 +0800
|
|
|
+
|
|
|
+ tijiao
|
|
|
+
|
|
|
+[33mcommit 4b892bd7b13d502096b6f04774f9cf360d87c528[m
|
|
|
+Merge: d12dbbb 4443c99
|
|
|
+Author: hujh <hujh@steerinfo.com>
|
|
|
+Date: Sat Jan 22 19:10:52 2022 +0800
|
|
|
+
|
|
|
+ 合并
|
|
|
+
|
|
|
+[33mcommit d12dbbbab5db6b710b26607fa6d3745cfddaf7e7[m
|
|
|
+Author: hujh <hujh@steerinfo.com>
|
|
|
+Date: Sat Jan 22 19:09:00 2022 +0800
|
|
|
+
|
|
|
+ 合并
|
|
|
+
|
|
|
+[33mcommit 4443c991bae385dc96419c9997d7eb385ad7f6c2[m
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Sat Jan 22 18:55:11 2022 +0800
|
|
|
+
|
|
|
+ tjiao
|
|
|
+
|
|
|
+[33mcommit fadc93c0a2525ed2409efc901e289a4bcafa7995[m
|
|
|
+Merge: e52a2c6 d77059f
|
|
|
+Author: zouzhd <1877123374@qq.com>
|
|
|
+Date: Sat Jan 22 17:49:07 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'master' into dev
|
|
|
+
|
|
|
+[33mcommit d77059fef5ed409a22bec3d9e90b0fd50f1c6358[m
|
|
|
+Author: zouzhd <1877123374@qq.com>
|
|
|
+Date: Sat Jan 22 17:48:30 2022 +0800
|
|
|
+
|
|
|
+ 油品名称 货物类型
|
|
|
+
|
|
|
+[33mcommit 9c6e28ed0ac7f07fb885f8912b42f6fb7e7592e6[m
|
|
|
+Merge: d2d408f 414cc2d
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Sat Jan 22 14:52:40 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API
|
|
|
+
|
|
|
+[33mcommit d2d408f0436d565660f4d6dd8b045591f432ca8e[m
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Sat Jan 22 14:52:27 2022 +0800
|
|
|
+
|
|
|
+ tijiao
|
|
|
+
|
|
|
+[33mcommit e52a2c6ad68ab2b0e8c0e9170b3837e4761cdf90[m
|
|
|
+Author: 胡杰焕 <hujh@steerinfo.com>
|
|
|
+Date: Sat Jan 22 11:29:04 2022 +0800
|
|
|
+
|
|
|
+ 更新 'src/main/resources/application-dev.yml'
|
|
|
+
|
|
|
+[33mcommit eded09f50ecc42246fb455f548ed0b6d2d90c699[m
|
|
|
+Author: hujh <hujh@steerinfo.com>
|
|
|
+Date: Sat Jan 22 11:23:31 2022 +0800
|
|
|
+
|
|
|
+ 提交倒垛
|
|
|
+
|
|
|
+[33mcommit 96a41c1bd7871ffcc6baa2cf7b96bc04b202bef5[m
|
|
|
+Merge: 7dd94e1 fe00a98
|
|
|
+Author: hujh <hujh@steerinfo.com>
|
|
|
+Date: Sat Jan 22 11:14:21 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev
|
|
|
+
|
|
|
+[33mcommit 7dd94e16e02be5b4855cd418cb5100f5c260e479[m
|
|
|
+Author: hujh <hujh@steerinfo.com>
|
|
|
+Date: Sat Jan 22 11:14:08 2022 +0800
|
|
|
+
|
|
|
+ 修改倒垛
|
|
|
+
|
|
|
+[33mcommit 414cc2dd059c8408070486eeb6855afd1d998baa[m
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Sat Jan 22 09:34:58 2022 +0800
|
|
|
+
|
|
|
+ as
|
|
|
+
|
|
|
+[33mcommit 7626b935358a452965ee8ecd324fc257ca6a29c6[m
|
|
|
+Merge: b2ecb23 fe00a98
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Sat Jan 22 09:34:39 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'dev'
|
|
|
+
|
|
|
+[33mcommit b2ecb236a8223311a66a76739ee5f5e0a2b3c5f7[m
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Fri Jan 21 18:40:11 2022 +0800
|
|
|
+
|
|
|
+ 修改
|
|
|
+
|
|
|
+[33mcommit bc25f60478601a85a71d2acad19b223f803dafa0[m
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Fri Jan 21 18:38:47 2022 +0800
|
|
|
+
|
|
|
+ 修改wms
|
|
|
+
|
|
|
+[33mcommit de8d13689fbd9762356958e8a0fee0729e56b708[m
|
|
|
+Merge: baf878a 4cdae87
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Fri Jan 21 17:14:18 2022 +0800
|
|
|
+
|
|
|
+ wmd修改
|
|
|
+
|
|
|
+[33mcommit baf878a2715031b5dbeb8a8494d21d8c99985f84[m
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Fri Jan 21 17:10:15 2022 +0800
|
|
|
+
|
|
|
+ 修改wms
|
|
|
+
|
|
|
+[33mcommit fe00a988d173e68398c5d06cc786a86e8e056e18[m
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Fri Jan 21 09:53:53 2022 +0800
|
|
|
+
|
|
|
+ sa
|
|
|
+
|
|
|
+[33mcommit 4cdae871cda51087a032d2cdefcf2e4229fbff67[m
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Fri Jan 21 08:16:14 2022 +0800
|
|
|
+
|
|
|
+ sad
|
|
|
+
|
|
|
+[33mcommit b8fcbcf2016df171f1f14035a6f50dfaa71e3c8c[m
|
|
|
+Merge: c482140 75192f0
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Fri Jan 21 08:11:12 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev
|
|
|
+
|
|
|
+[33mcommit c482140a69d718820279f43d00b3a4286b37b0a8[m
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Fri Jan 21 08:10:59 2022 +0800
|
|
|
+
|
|
|
+ 修改rms油价管理 和ams提升用户体验
|
|
|
+
|
|
|
+[33mcommit dc4ddbc9aabe2a8c79fb9d941f51f40795d54d0f[m
|
|
|
+Author: 张煊 <zhangx@steerinfo.com>
|
|
|
+Date: Thu Jan 20 23:01:10 2022 +0800
|
|
|
+
|
|
|
+ 更新 'src/main/resources/bootstrap.yml'
|
|
|
+
|
|
|
+[33mcommit 7d065df89822e2ed59e41147a36cfa02a090d68a[m
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Thu Jan 20 22:51:14 2022 +0800
|
|
|
+
|
|
|
+ 仓库管理
|
|
|
+
|
|
|
+[33mcommit 75192f02ba86f4906fa79773a7c59146907c654d[m[33m ([m[1;32mdev[m[33m)[m
|
|
|
+Merge: d534c20 a955e44
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Thu Jan 20 21:41:42 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev
|
|
|
+
|
|
|
+[33mcommit d534c20252778ef945aa20aff86ccf8b26740c6d[m
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Thu Jan 20 21:41:33 2022 +0800
|
|
|
+
|
|
|
+ 完成
|
|
|
+
|
|
|
+[33mcommit a955e44f0e3eb4ae51763d7a3ab351da064c92ee[m
|
|
|
+Author: zx <2981104106@qq.com>
|
|
|
+Date: Thu Jan 20 17:59:54 2022 +0800
|
|
|
+
|
|
|
+ 修改端口
|
|
|
+
|
|
|
+[33mcommit 9c1c21db721fbaa283d69e13869d2602b87ae1df[m
|
|
|
+Merge: 0511575 a2a159c
|
|
|
+Author: zx <2981104106@qq.com>
|
|
|
+Date: Thu Jan 20 17:58:47 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'master' into dev
|
|
|
+
|
|
|
+[33mcommit 0511575604d480cc038ba958276c0542478458b1[m
|
|
|
+Merge: cfc3eb0 11ddffa
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Thu Jan 20 16:37:31 2022 +0800
|
|
|
+
|
|
|
+ 入库
|
|
|
+
|
|
|
+[33mcommit cfc3eb078fb2f04f918d918844e730ebe4abb997[m
|
|
|
+Author: Tiroble <2439003195@qq.com>
|
|
|
+Date: Thu Jan 20 09:07:40 2022 +0800
|
|
|
+
|
|
|
+ 调试
|
|
|
+
|
|
|
+[33mcommit a2a159c29292470aec02c4b823c6420599851a92[m
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Wed Jan 19 17:52:35 2022 +0800
|
|
|
+
|
|
|
+ trj
|
|
|
+
|
|
|
+[33mcommit e9a57855aa2beb61de3c08158b71e3704b1e3882[m
|
|
|
+Merge: d179fd5 68b6913
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Wed Jan 19 17:04:46 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API
|
|
|
+
|
|
|
+[33mcommit d179fd5c73bbf6b1825f30b44c520a0546482d63[m
|
|
|
+Author: Your Name <you@example.com>
|
|
|
+Date: Wed Jan 19 17:03:53 2022 +0800
|
|
|
+
|
|
|
+ tijiao
|
|
|
+
|
|
|
+[33mcommit 68b6913d6e670a73c835659d4285d956f49785e5[m
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Wed Jan 19 14:06:06 2022 +0800
|
|
|
+
|
|
|
+ as
|
|
|
+
|
|
|
+[33mcommit 11ddffaad62f5d24cea4a48acf6bf43f6d312d02[m
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Wed Jan 19 14:04:29 2022 +0800
|
|
|
+
|
|
|
+ 修改查询接口方法处理
|
|
|
+
|
|
|
+[33mcommit 1ca2a72ac3a7e90d16581ee81a9021930700e817[m
|
|
|
+Merge: 9ea9f2a de3324a
|
|
|
+Author: zouzhd <1877123374@qq.com>
|
|
|
+Date: Tue Jan 18 22:51:14 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'master' into dev
|
|
|
+
|
|
|
+[33mcommit de3324aa055194c5c80c977b296c737a56b7be80[m
|
|
|
+Merge: 71e9b19 5fbbbf6
|
|
|
+Author: zouzhd <1877123374@qq.com>
|
|
|
+Date: Tue Jan 18 22:36:34 2022 +0800
|
|
|
+
|
|
|
+ 合并
|
|
|
+
|
|
|
+[33mcommit 71e9b19237037e8c867850ee3f6038676e04b7d4[m
|
|
|
+Author: zouzhd <1877123374@qq.com>
|
|
|
+Date: Tue Jan 18 22:31:45 2022 +0800
|
|
|
+
|
|
|
+ 销售统计报表获取总净重
|
|
|
+
|
|
|
+[33mcommit 9ea9f2ad1616c2091b603170bf8e637f2fa1f811[m
|
|
|
+Author: zx <2981104106@qq.com>
|
|
|
+Date: Tue Jan 18 21:12:22 2022 +0800
|
|
|
+
|
|
|
+ 修改
|
|
|
+
|
|
|
+[33mcommit 5fbbbf68be2591a83a93e0b55e56106317974b20[m
|
|
|
+Author: zx <2981104106@qq.com>
|
|
|
+Date: Tue Jan 18 21:08:58 2022 +0800
|
|
|
+
|
|
|
+ 修改
|
|
|
+
|
|
|
+[33mcommit 0e22d5c72c6cd13fd7bb65e1f3a3afd13451d846[m
|
|
|
+Merge: 9db5343 525373a
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Sat Jan 15 18:26:06 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'dev'
|
|
|
+
|
|
|
+[33mcommit 525373ad1ff1678eba1f656916589fd9a1901ec4[m
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Sat Jan 15 18:25:39 2022 +0800
|
|
|
+
|
|
|
+ asd
|
|
|
+
|
|
|
+[33mcommit a3a9572af2ac55049941923785d79316bdaaa502[m
|
|
|
+Merge: cf851f5 fc02552
|
|
|
+Author: txf <965018027@qq.com>
|
|
|
+Date: Sat Jan 15 18:23:54 2022 +0800
|
|
|
+
|
|
|
+ Merge branch 'dev' of htt
|
Tiroble