Merge remote-tracking branch 'origin/master'

Junjie

2023-12-30 ba94aa39ae925d9021b0ca13ca0b11dd6843656b

Merge remote-tracking branch 'origin/master'

 zy-asrs-common/pom.xml

@@ -64,7 +64,7 @@
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>easyexcel</artifactId>
            <version>3.3.2</version>
            <version>2.2.6</version>
        </dependency>
    </dependencies>


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java

@@ -24,7 +24,7 @@
        generator.url="47.97.1.152:51433;databasename=jkasrs";
        generator.username="sa";
        generator.password="Zoneyung@zy56$";
        generator.table="wcs_motion_sts";
        generator.table="wcs_crn";
        generator.packagePath="com.zy.asrs.common.wcs";
        generator.build();
    }