guoshengxiong
1e0975255a
# Conflicts: # src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeController.java # src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectCheckController.java # src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectCheckRecordController.java # src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectTableController.java # src/main/java/com/zhgd/xmgl/modules/machinedevice/controller/MachineDeviceLargeEntryInspectTableRecordController.java # src/main/java/com/zhgd/xmgl/modules/policecamera/controller/PoliceCameraItemController.java
修改mysql
-
my.cnf文件或my.ini文件的sql-mode修改成下面的值 [mysqld] sql-mode=" STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
-
导入sql文件的function失败执行下面命令 set global log_bin_trust_function_creators=TRUE;
idea配置
idea运行需要把内存修改大一点
