Merge remote-tracking branch 'origin/dev_New' into dev_New

gongchunyi

21 小时以前 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

 src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java

@@ -44,7 +44,7 @@
import java.util.List;

@Service
@RequiredArgsConstructor
//@RequiredArgsConstructor
public class ApproveNodeServiceImpl extends ServiceImpl<ApproveNodeMapper, ApproveNode> implements IApproveNodeService {

    @Autowired
@@ -241,7 +241,7 @@
                if(status.equals(2)){
                    shippingInfo.setStatus("审核通过");
                }else if(status.equals(3)){
                    shippingInfo.setType("审核拒绝");
                    shippingInfo.setStatus("审核拒绝");
                }else if(status.equals(1)){
                    shippingInfo.setStatus("审核中");
                }