Merge remote-tracking branch 'origin/master'

wzh

2022-07-29 cb70a5110bc73fb6ce025ab4265e7f00d4694ab5

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderGeneralService.java

File was renamed from phis-feign/src/main/java/com/hz/his/feign/service/SOrderGeneralService.java
@@ -1,4 +1,4 @@
package com.hz.his.feign.service;
package com.hz.his.feign.service.phis;

import com.hx.resultTool.Result;
import org.springframework.cloud.openfeign.FeignClient;