Merge branch 'upgrade' into dev_upgrade-1225

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/BubbleTipAction.java

@@ -30,7 +30,7 @@ public class BubbleTipAction implements CustomerAction
 	
 	
 	//@ExposeAction("气泡提示")
-	@RuleMethod(methodLabel = "气泡提示", project = "青海风险管控")
+	@RuleMethod(methodLabel = "气泡提示", project = "风险管控")
 	public void sendBubbleTip(Object bizobj, Boolean showInfo, Object title, String type)
 	{
 		BubbleTipResult result = new BubbleTipResult();

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/CheckInputItemRo.java

@@ -9,7 +9,7 @@ import lombok.Data;
 /**
  * @author DELL
  */
-@RuleFact(value = "检查项",project = "青海风险管控")
+@RuleFact(value = "检查项",project = "风险管控")
 @Data
 public class CheckInputItemRo implements Serializable {
 	/**

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/FireEquimentDataRo.java

@@ -7,7 +7,7 @@ import lombok.Data;
 
 import java.security.acl.LastOwnerException;
 
-@RuleFact(value = "消防设备",project = "青海风险管控")
+@RuleFact(value = "消防设备",project = "风险管控")
 @Data
 public class FireEquimentDataRo extends BasicsRo
 {

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/ProtalDataRo.java

@@ -7,7 +7,7 @@ import com.yeejoin.amos.component.rule.RuleFact;
 import lombok.Data;
 
 
-@RuleFact(value = "巡检点",project = "青海风险管控")
+@RuleFact(value = "巡检点",project = "风险管控")
 @Data
 public class ProtalDataRo extends BasicsRo {
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/RiskSourceRo.java

@@ -8,7 +8,7 @@ import com.yeejoin.amos.component.rule.RuleFact;
 
 import lombok.Data;
 
-@RuleFact(value = "风险点",project = "青海风险管控")
+@RuleFact(value = "风险点",project = "风险管控")
 @Data
 public class RiskSourceRo extends BasicsRo {
 

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/action/model/RiskSourceRuleRo.java

@@ -7,7 +7,7 @@ import com.yeejoin.amos.component.rule.RuleFact;
 
 import lombok.Data;
 
-@RuleFact(value = "风险点-关联巡检点",project = "青海风险管控")
+@RuleFact(value = "风险点-关联巡检点",project = "风险管控")
 @Data
 public class RiskSourceRuleRo extends BasicsRo {