-
Merge remote-tracking branch 'origin/material-v1.0' into material-v1.0 · 77febb80
# Conflicts: # src/main/java/com/orhon/smartcampus/material/modules/management/entity/GoodsClassify.java # src/main/java/com/orhon/smartcampus/material/modules/management/fetcher/MaterialFetchersLoader.java # src/main/java/com/orhon/smartcampus/material/modules/management/gqlInputModel/GQLGoodsClassifyInput.java # src/main/java/com/orhon/smartcampus/material/modules/management/gqlModel/GQLGoodsClassify.java # src/main/java/com/orhon/smartcampus/material/modules/management/mm/GoodsClassifyMapper.java # src/main/resources/graphql/material.graphqls # src/main/resources/graphql/root.graphqls
sunyunfeng committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .mvn/wrapper | Loading commit data... | |
| src | Loading commit data... | |
| .gitignore | Loading commit data... | |
| mvnw | Loading commit data... | |
| mvnw.cmd | Loading commit data... | |
| pom.xml | Loading commit data... |