forked from ard/ruoyi-api
parent: 70e428 | patch | commitdiff
艾金辉
2023-07-24 b5cf2539edf29b0da8bde02ad3b5c1c373824a34
refs
author 艾金辉 <1144154118@qq.com>
Monday, July 24, 2023 15:23 +0800
committer 艾金辉 <1144154118@qq.com>
Monday, July 24, 2023 15:23 +0800
commitb5cf2539edf29b0da8bde02ad3b5c1c373824a34
tree 5ba728f3b61259615a91723f9d597321ef06d7e9 tree | zip | gz
parent 70e428a02ebd913af53c88bc18e794938312c537 view | diff
5b07daf4e37042a7ef3b05a38683a58939fb9cea view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
#	ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
1 files deleted
2 files modified
96 ■■■■■ changed files
ard-work/src/main/java/com/ruoyi/app/tasktext/controller/ArdAppTaskTextController.java 5 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/utils/httpclient/SYCarClient.java 78 ●●●●● diff | view | raw | blame | history