Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 a3c54410de03f0fd242e1a1118d6471300cf1eda

 src/main/java/com/ruoyi/CodeGenerator.java

@@ -20,7 +20,7 @@
// 演示例子，执行 main 方法控制台输入模块表名回车自动生成对应项目目录中
public class CodeGenerator {

    public static String database_url = "jdbc:mysql://localhost:3307/product-inventory-management-new-pro";
    public static String database_url = "jdbc:mysql://localhost:3306/product-inventory-management-new-pro";
    public static String database_username = "root";
    public static String database_password= "123456";
    public static String author = "芯导软件（江苏）有限公司";