Skip to content

j4-status-yuhang#4

Open
astro-zhou wants to merge 113 commits intomasterfrom
j4
Open

j4-status-yuhang#4
astro-zhou wants to merge 113 commits intomasterfrom
j4

Conversation

@astro-zhou
Copy link
Copy Markdown
Collaborator

修改单据状态

zero-awei and others added 30 commits February 4, 2023 20:57
定义es客户端版本管理
- 完善付款单明细实体类的注释(源单id)
添加操作开启条件
添加操作开启条件
# Conflicts:
#	psi-java/psi-apis/src/main/java/com/zeroone/star/project/payment/PaymentApis.java
#	psi-java/psi-payment/src/main/java/com/zeroone/star/payment/controller/PaymentController.java
forlove-SDN and others added 30 commits February 23, 2023 20:34
# Conflicts:
#	psi-java/psi-apis/src/main/java/com/zeroone/star/project/prepayment/PrepaymentApis.java
#	psi-java/psi-domain/src/main/java/com/zeroone/star/project/vo/prepayment/FinPaymentReqVO.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/config/ComponentInit.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/controller/PrepaymentController.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/entity/FinPayment.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/IFinPaymentEntryService.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/IFinPaymentReqEntryService.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/IFinPaymentReqService.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/IFinPaymentService.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/impl/FinPaymentEntryServiceImpl.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/impl/FinPaymentReqEntryServiceImpl.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/impl/FinPaymentReqServiceImpl.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/impl/FinPaymentServiceImpl.java
# Conflicts:
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/IFinPaymentService.java
#	psi-java/psi-prepayment/src/main/java/com/zeroone/star/prepayment/service/impl/FinPaymentServiceImpl.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants