f_risk_level  create_by     long改为 varchar
f_equipment    charge_dept_id    charge_user_id   long改为 varchar
f_evaluation_model    create_by     long改为 varchar
f_fire_station   create_by     long改为 varchar
f_fire_station_equipment  create_by     long改为 varchar
f_fire_strength   create_by     long改为 varchar
f_fmea              identify_user  long改为 varchar
f_preplan_picture   create_by     long改为 varchar
f_risk_factor   create_by  dept_id    long改为 varchar
f_risk_source  create_by     long改为 varchar
f_water_resource   create_by     long改为 varchar

2、计算rpn修改

# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/controller/PlanVisual3dController.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipPointServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FmeaServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/ITopographyNodeServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/intfc/IRiskSourceService.java
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/client/invoke/RsDataQueue.java
#	YeeAmosFireAutoSysStart/src/main/resources/db/changelog/fas-1.0.2.xml

# Conflicts:
#	YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/RiskSourceServiceImpl.java

2.修改安全指数流水服务-全景监控