dev-ljw #4

Merged

ljw merged 6 commits from dev-ljw into test 2024-08-28 17:42:21 +08:00

Conversation 0 Commits 6 Files Changed 4 +108 -15

ljw commented 2024-08-28 17:41:56 +08:00

Collaborator

Copy Link

No description provided.

ljw added 6 commits 2024-08-28 17:41:58 +08:00

l 6c55309096

Merge branch 'main' into dev-ljw ... 95195bb712

# Conflicts:
#	.gitignore
#	cosmic.build.xml
#	cosmic.properties
#	src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java
#	src/main/java/com/yem/wm/task/ServiceRepairTask.java
#	src/main/java/kd/cosmic/Application.java
#	src/main/java/kd/cosmic/server/Launcher.java

Merge remote-tracking branch 'orinin/test' into dev-ljw 12c316893e

l 8966670dec

l fab8a9cd9f

l 12ba81e92a

ljw merged commit c6f606c769 into test 2024-08-28 17:42:21 +08:00

ljw referenced this issue from a commit 2024-08-28 17:42:23 +08:00

Merge pull request 'dev-ljw' (#4) from dev-ljw into test

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: violet/ensign#4

No description provided.