Merge branch 'dev-reset-0914' into dev

src/main/java/com/uas/ps/inquiry/controller/InquiryForSaleController.java

@@ -210,7 +210,7 @@ public class InquiryForSaleController {
      *              UAS
      * @param userUU
      * @param enUU
-     * @param itemId
+     * @param itemId 来源公共询价询价明细id
      * @return
      */
     @RequestMapping(value = "/allot/inquiry", method = RequestMethod.POST)

src/main/java/com/uas/ps/inquiry/controller/PublicInquiryController.java

@@ -211,6 +211,7 @@ public class PublicInquiryController {
      * @author hejq
      * @date 2018-01-14 15:20
      */
+    @Deprecated
     @RequestMapping(value = "/turntoInquiry", method = RequestMethod.POST)
     private ModelMap transtoInquiry(Long id, Long enuu, Long useruu) {
         long start = System.currentTimeMillis();