Merge branch 'develop' into develop-green

src/custom/restcontroller/webmanage/lsak3/item/item.java

@@ -314,8 +314,12 @@ public class item extends Controller {
                     sqlFactory.addParameter("widthschemeid",1);
                     sqlFactory.addParameter("lengthschemeid", 1);
                 }
+                if(fitemname.contains("内开隐形门")){
+                    sqlFactory.addParameter("pricingmetod", 2);
+                }else{
+                    sqlFactory.addParameter("pricingmetod", 1);
+                }
 
-                sqlFactory.addParameter("pricingmetod", 1);
 
             }else{
                 sqlFactory.addParameter("widthschemeid",0);