feat:1.代码提交

jeecg-module-system/pom.xml

@@ -73,10 +73,6 @@
             <properties>
                 <package.environment>hkl</package.environment>
             </properties>
-            <!-- 是否默认 true表示默认-->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
 
         <!-- 测试环境 -->
@@ -93,6 +89,10 @@
             <properties>
                 <package.environment>pressure</package.environment>
             </properties>
+            <!-- 是否默认 true表示默认-->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
 
         <!-- 生成环境环境-->

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/entity/AnalysisAdditiveCheckUnitDeviceMap.java

@@ -63,6 +63,10 @@ public class AnalysisAdditiveCheckUnitDeviceMap implements Serializable {
     @TableField("movement_master_id")
     private String movementMasterId;
 
+    @ApiModelProperty("动静态几何尺寸数据主表主键-》外键")
+    @TableField("movement_additive_info_id")
+    private String movementAdditiveInfoId;
+
     @ApiModelProperty("设备单元id")
     @TableField("unit_id")
     private String unitId;

jeecg-module-system/src/main/resources/application-dev.yml

@@ -131,7 +131,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://47.94.207.62:3306/hzgw3?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
+          url: jdbc:mysql://47.94.207.62:3306/hzsomms?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
           password: superAdmin&321
           driver-class-name: com.mysql.jdbc.Driver

jeecg-module-system/src/main/resources/application-test.yml

@@ -307,4 +307,4 @@ third-app:
       client-id: ??
       # appSecret
       client-secret: ??
-      agent-id: ??
+      agent-id: ??
\ No newline at end of file

jeecg-module-system/src/main/resources/logback-spring.xml

@@ -69,9 +69,9 @@
 	<!-- 日志输出级别 -->
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
-<!--		<appender-ref ref="FILE" />-->
-<!--		<appender-ref ref="HTML" />-->
-<!--		<appender-ref ref="FILE_HTML" />-->
+		<appender-ref ref="FILE" />
+		<appender-ref ref="HTML" />
+		<appender-ref ref="FILE_HTML" />
 	</root>
 
-</configuration>
+</configuration>
\ No newline at end of file