Merge remote-tracking branch 'origin/dev' into dev

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/util/MesPcnException.java

@@ -48,7 +48,7 @@ public class MesPcnException {
      * @param errorDetail 错误详情
      * @param errorSoluction 解决办法
      */
-    public static void throwBusiException(String errorCode,String errorDetail,String errorSoluction,Object...args){
+    public static void throwBusiExceptionByCode(String errorCode,String errorDetail,String errorSoluction,Object...args){
         throw ImppExceptionBuilder.newInstance()
                 .setSystemID(CommonEnumUtil.SOFT_TYPE.MES_PCN.getCode())
                 .setErrorCode(errorCode)