Merge branch 'develop_master' into 'FOTON'

Develop master

See merge request LiuChao/foton-slrs-system-rest!283
This commit is contained in:
王夏晖
2021-12-15 09:16:47 +08:00
31 changed files with 658 additions and 57 deletions
@@ -18,13 +18,13 @@ public class CodeGen {
private static final String PACKAGE_PATH="/adc-da-slrs/src/main";
private static final String AUTHOR="super_liu";
private static final String AUTHOR="zhaokaiyao";
private static final String DB_IP="127.0.0.1:3306/foton_slrs_test";
private static final String DB_IP="123.56.177.15:3306/foton_slrs_test2";
private static final String DB_USER="root";
private static final String DB_PWD="root";
private static final String DB_PWD="RsLDRj3dXtSwYjBI";
/**