Commit deef74ef by 赵剑炜

整合项目

parent 3abf09a8
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml
# Zeppelin ignored files
/ZeppelinRemoteNotebooks/
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<module name="jyzb-process" />
<module name="jyzb-api" />
<module name="jyzb-biz" />
<module name="jyzb-boot" />
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="junmp-jyzb-app" options="-parameters" />
<module name="jyzb-api" options="-parameters" />
<module name="jyzb-biz" options="-parameters" />
<module name="jyzb-boot" options="-parameters" />
<module name="jyzb-process" options="-parameters" />
</option>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding">
<file url="file://$PROJECT_DIR$/jyzb-api/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-api/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-biz/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-biz/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-boot/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-boot/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-process/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jyzb-process/src/main/resources" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="aliyun" />
<option name="name" value="aliyun" />
<option name="url" value="http://maven.aliyun.com/nexus/content/groups/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="junmp-public" />
<option name="name" value="junmp-public" />
<option name="url" value="http://maven.sothing.top/repository/junmp-public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="oss" />
<option name="name" value="oss" />
<option name="url" value="https://oss.sonatype.org/content/groups/public" />
</remote-repository>
<remote-repository>
<option name="id" value="spring-milestones" />
<option name="name" value="Spring Milestones" />
<option name="url" value="https://repo.spring.io/libs-milestone" />
</remote-repository>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
<option value="$PROJECT_DIR$/jyzb-process/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_19" default="true" project-jdk-name="19" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>
\ No newline at end of file
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>junmp-gold-app</artifactId> <artifactId>junmp-jyzb-app</artifactId>
<groupId>com.junmp.gold</groupId> <groupId>com.junmp.jyzb</groupId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>gold-api</artifactId> <artifactId>jyzb-api</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<name>gold-api</name> <name>jyzb-api</name>
<dependencies> <dependencies>
<dependency> <dependency>
......
artifactId=jyzb-api
groupId=com.junmp.jyzb
version=1.0.0
com\junmp\gold\api\bean\vo\ProductSkuVo.class
com\junmp\gold\api\exception\enums\CompanyExceptionEnum.class
com\junmp\gold\api\exception\enums\ProductExceptionEnum.class
com\junmp\gold\api\bean\dto\ProductProcessDto.class
com\junmp\gold\api\bean\req\ProductSkuReq.class
com\junmp\gold\api\bean\dto\ProductTagDto.class
com\junmp\gold\api\bean\dto\ProductBatchDto.class
com\junmp\gold\api\bean\vo\TagInfoVo.class
com\junmp\gold\api\constant\GoldConstant.class
com\junmp\gold\api\bean\vo\NDefContentVo.class
com\junmp\gold\api\bean\vo\TagInfoVo$TagInfoVoBuilder.class
com\junmp\gold\api\bean\req\DbAccessReq.class
com\junmp\gold\api\util\GenCodeUtil.class
com\junmp\gold\api\bean\req\CompanyReq.class
com\junmp\gold\api\bean\req\ProductBatchReq.class
com\junmp\gold\api\bean\req\ProductTagReq.class
com\junmp\gold\api\bean\dto\SimpleTagDto.class
com\junmp\gold\api\exception\GoldAppException.class
com\junmp\gold\api\bean\req\ProductReq.class
com\junmp\gold\api\bean\vo\AuthAccessVo.class
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\ProductTagReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\dto\ProductTagDto.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\util\GenCodeUtil.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\DbAccessReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\exception\enums\package-info.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\exception\enums\ProductExceptionEnum.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\exception\enums\CompanyExceptionEnum.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\exception\GoldAppException.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\ProductReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\vo\AuthAccessVo.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\ProductBatchReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\CompanyReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\constant\GoldConstant.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\dto\ProductProcessDto.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\vo\NDefContentVo.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\dto\ProductBatchDto.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\req\ProductSkuReq.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\vo\ProductSkuVo.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\dto\SimpleTagDto.java
C:\项目\JAVA\主平台\junmp-jyzb-app\jyzb-api\src\main\java\com\junmp\gold\api\bean\vo\TagInfoVo.java
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<artifactId>junmp-gold-app</artifactId> <artifactId>junmp-jyzb-app</artifactId>
<groupId>com.junmp.gold</groupId> <groupId>com.junmp.jyzb</groupId>
<version>1.0.0</version> <version>1.0.0</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>gold-biz</artifactId> <artifactId>jyzb-biz</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<name>gold-biz</name> <name>jyzb-biz</name>
<dependencies> <dependencies>
<dependency> <dependency>
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.junmp.gold</groupId> <groupId>com.junmp.jyzb</groupId>
<artifactId>gold-api</artifactId> <artifactId>jyzb-api</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.junmp.v2</groupId> <groupId>com.junmp.v2</groupId>
......
...@@ -23,4 +23,9 @@ public interface CompanyMapper extends BaseMapper<Company> { ...@@ -23,4 +23,9 @@ public interface CompanyMapper extends BaseMapper<Company> {
* 获取当前最大序号 * 获取当前最大序号
*/ */
Integer getMaxSn(); Integer getMaxSn();
/**
* 获取当前最大序号
*/
Integer getMaxSn1();
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论